projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::DeviceManager now manages opening/closing devices
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 131f057de5d881e72d442418dff4952ebef74a27..5ab30ab1299e2e7bb81475053049eb46f189c3e1 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-20,6
+20,7
@@
#include "sigsession.h"
#include "sigsession.h"
+#include "devicemanager.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
#include "data/logic.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
#include "data/logic.h"
@@
-39,7
+40,8
@@
namespace pv {
// TODO: This should not be necessary
SigSession* SigSession::_session = NULL;
// TODO: This should not be necessary
SigSession* SigSession::_session = NULL;
-SigSession::SigSession() :
+SigSession::SigSession(DeviceManager &device_manager) :
+ _device_manager(device_manager),
_sdi(NULL),
_capture_state(Stopped)
{
_sdi(NULL),
_capture_state(Stopped)
{
@@
-66,9
+68,21
@@
struct sr_dev_inst* SigSession::get_device() const
void SigSession::set_device(struct sr_dev_inst *sdi)
{
void SigSession::set_device(struct sr_dev_inst *sdi)
{
+ if (_sdi)
+ _device_manager.release_device(_sdi);
+ if (sdi)
+ _device_manager.use_device(sdi, this);
_sdi = sdi;
}
_sdi = sdi;
}
+void SigSession::release_device(struct sr_dev_inst *sdi)
+{
+ (void)sdi;
+
+ assert(_capture_state == Stopped);
+ _sdi = NULL;
+}
+
void SigSession::load_file(const string &name,
function<void (const QString)> error_handler)
{
void SigSession::load_file(const string &name,
function<void (const QString)> error_handler)
{
@@
-167,6
+181,10
@@
void SigSession::load_thread_proc(const string name,
sr_session_destroy();
set_capture_state(Stopped);
sr_session_destroy();
set_capture_state(Stopped);
+
+ // Confirm that SR_DF_END was received
+ assert(!_cur_logic_snapshot);
+ assert(!_cur_analog_snapshot);
}
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
}
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
@@
-205,6
+223,10
@@
void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
sr_session_destroy();
set_capture_state(Stopped);
sr_session_destroy();
set_capture_state(Stopped);
+
+ // Confirm that SR_DF_END was received
+ assert(!_cur_logic_snapshot);
+ assert(!_cur_analog_snapshot);
}
void SigSession::feed_in_header(const sr_dev_inst *sdi)
}
void SigSession::feed_in_header(const sr_dev_inst *sdi)