X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevice%2Fdevice.cpp;h=4a30e5fcd75c3bb12df003096888c6c16dd116aa;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=4a3ec35f1869364c04f02da03f2577c36cdcf7f8;hpb=07dcf5615620315f4eda91a930b8540e64b625f2;p=pulseview.git

diff --git a/pv/device/device.cpp b/pv/device/device.cpp
index 4a3ec35..4a30e5f 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>
@@ -41,6 +42,28 @@ sr_dev_inst* Device::dev_inst() const
 	return _sdi;
 }
 
+void Device::use(SigSession *owner) throw(QString)
+{
+	DevInst::use(owner);
+
+	sr_session_new();
+
+	assert(_sdi);
+	sr_dev_open(_sdi);
+	if (sr_session_dev_add(_sdi) != SR_OK)
+		throw QString(tr("Failed to use device."));
+}
+
+void Device::release()
+{
+	if (_owner) {
+		DevInst::release();
+		sr_session_destroy();
+	}
+
+	sr_dev_close(_sdi);
+}
+
 std::string Device::format_device_title() const
 {
 	ostringstream s;
@@ -69,8 +92,8 @@ std::string Device::format_device_title() const
 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;
+	for (const GSList *l = _sdi->channels; l; l = l->next) {
+		const sr_channel *const p = (const sr_channel *)l->data;
 		assert(p);
 		if (p->trigger && p->trigger[0] != '\0')
 			return true;