Update to new session API.

[pulseview.git] / pv / device / device.cpp

diff --git a/pv/device/device.cpp b/pv/device/device.cpp
index ca18fc13a73e2f63432832a9b536568d658f0437..40044f8cd9490d8cae5be998f8359881114696e8 100644 (file)
--- a/pv/device/device.cpp
+++ b/pv/device/device.cpp
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <cassert>
 #include <sstream>
 
 #include <libsigrok/libsigrok.h>
@@ -31,8 +32,36 @@ namespace pv {
 namespace device {
 
 Device::Device(sr_dev_inst *sdi) :
-       DevInst(sdi)
+       _sdi(sdi)
 {
+       assert(_sdi);
+}
+
+sr_dev_inst* Device::dev_inst() const
+{
+       return _sdi;
+}
+
+void Device::use(SigSession *owner) throw(QString)
+{
+       DevInst::use(owner);
+
+       sr_session_new(&SigSession::_sr_session);
+
+       assert(_sdi);
+       sr_dev_open(_sdi);
+       if (sr_session_dev_add(SigSession::_sr_session, _sdi) != SR_OK)
+               throw QString(tr("Failed to use device."));
+}
+
+void Device::release()
+{
+       if (_owner) {
+               DevInst::release();
+               sr_session_destroy(SigSession::_sr_session);
+       }
+
+       sr_dev_close(_sdi);
 }
 
 std::string Device::format_device_title() const