X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevice%2Fdevice.cpp;h=40044f8cd9490d8cae5be998f8359881114696e8;hb=bb3030b34e44733036acdfe5b4d4ec0705146831;hp=e70be02592f0c58e3c2b59340068b39478f94842;hpb=ae2d1bc5b5aba9fcdd7fef42ef1bc9069267d6f7;p=pulseview.git

diff --git a/pv/device/device.cpp b/pv/device/device.cpp
index e70be02..40044f8 100644
--- 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>
@@ -45,11 +46,11 @@ void Device::use(SigSession *owner) throw(QString)
 {
 	DevInst::use(owner);
 
-	sr_session_new();
+	sr_session_new(&SigSession::_sr_session);
 
 	assert(_sdi);
 	sr_dev_open(_sdi);
-	if (sr_session_dev_add(_sdi) != SR_OK)
+	if (sr_session_dev_add(SigSession::_sr_session, _sdi) != SR_OK)
 		throw QString(tr("Failed to use device."));
 }
 
@@ -57,7 +58,7 @@ void Device::release()
 {
 	if (_owner) {
 		DevInst::release();
-		sr_session_destroy();
+		sr_session_destroy(SigSession::_sr_session);
 	}
 
 	sr_dev_close(_sdi);
@@ -88,17 +89,5 @@ std::string Device::format_device_title() const
 	return s.str();
 }
 
-bool Device::is_trigger_enabled() const
-{
-	assert(_sdi);
-	for (const GSList *l = _sdi->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;
-}
-
 } // device
 } // pv