#include "sigsession.h"
#include "devicemanager.h"
-#include "device/devinst.h"
+#include "device/device.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
SigSession::~SigSession()
{
+ using pv::device::Device;
+
stop_capture();
if (_sampling_thread.joinable())
_sampling_thread.join();
- if (_dev_inst)
- _device_manager.release_device(_dev_inst);
+ _dev_inst->release();
// TODO: This should not be necessary
_session = NULL;
void SigSession::set_device(shared_ptr<device::DevInst> dev_inst)
{
+ using pv::device::Device;
+
// Ensure we are not capturing before setting the device
stop_capture();
if (_dev_inst)
- _device_manager.release_device(_dev_inst);
+ _dev_inst->release();
+
if (dev_inst)
- _device_manager.use_device(dev_inst, this);
+ dev_inst->use(this);
+
_dev_inst = dev_inst;
update_signals(dev_inst);
}
-void SigSession::release_device(shared_ptr<device::DevInst> dev_inst)
+void SigSession::release_device(device::DevInst *dev_inst)
{
(void)dev_inst;
+ assert(_dev_inst.get() == dev_inst);
assert(_capture_state == Stopped);
_dev_inst = shared_ptr<device::DevInst>();
}
shared_ptr<device::DevInst> dev_inst(
- new device::DevInst((sr_dev_inst*)devlist->data));
+ new device::Device((sr_dev_inst*)devlist->data));
g_slist_free(devlist);
_decode_traces.clear();
_decode_traces.clear();
update_signals(shared_ptr<device::DevInst>(
- new device::DevInst(in->sdi)));
+ new device::Device(in->sdi)));
read_sample_rate(in->sdi);
_sampling_thread = boost::thread(
signals_changed();
}
-bool SigSession::is_trigger_enabled() const
-{
- assert(_dev_inst);
- assert(_dev_inst->dev_inst());
- for (const GSList *l = _dev_inst->dev_inst()->probes; l; l = l->next) {
- const sr_probe *const p = (const sr_probe *)l->data;
- assert(p);
- if (p->trigger && p->trigger[0] != '\0')
- return true;
- }
-
- return false;
-}
-
shared_ptr<view::Signal> SigSession::signal_from_probe(
const sr_probe *probe) const
{
return;
}
- set_capture_state(is_trigger_enabled() ? AwaitingTrigger : Running);
+ set_capture_state(dev_inst->is_trigger_enabled() ?
+ AwaitingTrigger : Running);
sr_session_run();
sr_session_destroy();