projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add serial_num/connection_id handling and save/restore last device
[pulseview.git]
/
pv
/
device
/
sessionfile.cpp
diff --git
a/pv/device/sessionfile.cpp
b/pv/device/sessionfile.cpp
index ffdeb670d7efea1d368cddce78cb79faaf882239..a2810d421913c7017a57a6d839f665d0eac87cc2 100644
(file)
--- a/
pv/device/sessionfile.cpp
+++ b/
pv/device/sessionfile.cpp
@@
-18,6
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#include "sessionfile.h"
#include <libsigrok/libsigrok.h>
#include "sessionfile.h"
#include <libsigrok/libsigrok.h>
@@
-40,11
+42,11
@@
void SessionFile::use(SigSession *owner) throw(QString)
{
assert(!_sdi);
{
assert(!_sdi);
- if (sr_session_load(_path.c_str()) != SR_OK)
+ if (sr_session_load(_path.c_str()
, &SigSession::_sr_session
) != SR_OK)
throw tr("Failed to open file.\n");
GSList *devlist = NULL;
throw tr("Failed to open file.\n");
GSList *devlist = NULL;
- sr_session_dev_list(&devlist);
+ sr_session_dev_list(
SigSession::_sr_session,
&devlist);
if (!devlist || !devlist->data) {
if (devlist)
if (!devlist || !devlist->data) {
if (devlist)
@@
-67,7
+69,7
@@
void SessionFile::release()
File::release();
sr_dev_close(_sdi);
sr_dev_clear(_sdi->driver);
File::release();
sr_dev_close(_sdi);
sr_dev_clear(_sdi->driver);
- sr_session_destroy();
+ sr_session_destroy(
SigSession::_sr_session
);
_sdi = NULL;
}
_sdi = NULL;
}