X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdevice%2Fdevinst.h;h=1e0850c8cd9ae8089e2e98df7e65a97f3feae84f;hb=87b79835014a386fb51b52bc993dbb693bd27197;hp=9098027eb84e0674da978a65c38e67df3485c36f;hpb=996b7c9da9b5cb56413e829217e1e7d7d7d520da;p=pulseview.git

diff --git a/pv/device/devinst.h b/pv/device/devinst.h
index 9098027..1e0850c 100644
--- a/pv/device/devinst.h
+++ b/pv/device/devinst.h
@@ -21,10 +21,10 @@
 #ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
 #define PULSEVIEW_PV_DEVICE_DEVINST_H
 
+#include <map>
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include <QObject>
 
 #include <glib.h>
@@ -32,12 +32,12 @@
 #include <stdint.h>
 
 struct sr_dev_inst;
-struct sr_probe;
-struct sr_probe_group;
+struct sr_channel;
+struct sr_channel_group;
 
-namespace pv {
+#include <pv/sigsession.h>
 
-class SigSession;
+namespace pv {
 
 namespace device {
 
@@ -46,26 +46,28 @@ class DevInst : public QObject
 	Q_OBJECT
 
 protected:
-	DevInst(sr_dev_inst *sdi);
+	DevInst();
 
 public:
-	sr_dev_inst* dev_inst() const;
+	virtual sr_dev_inst* dev_inst() const = 0;
 
-	void use(SigSession *owner);
+	virtual void use(SigSession *owner) throw(QString);
 
-	void release();
+	virtual void release();
 
 	SigSession* owner() const;
 
 	virtual std::string format_device_title() const = 0;
 
-	GVariant* get_config(const sr_probe_group *group, int key);
+	virtual std::map<std::string, std::string> get_device_info() const = 0;
+
+	GVariant* get_config(const sr_channel_group *group, int key);
 
-	bool set_config(const sr_probe_group *group, int key, GVariant *data);
+	bool set_config(const sr_channel_group *group, int key, GVariant *data);
 
-	GVariant* list_config(const sr_probe_group *group, int key);
+	GVariant* list_config(const sr_channel_group *group, int key);
 
-	void enable_probe(const sr_probe *probe, bool enable = true);
+	void enable_channel(const sr_channel *channel, bool enable = true);
 
 	/**
 	 * @brief Gets the sample limit from the driver.
@@ -75,11 +77,17 @@ public:
 	 */
 	uint64_t get_sample_limit();
 
-signals:
+	virtual bool is_trigger_enabled() const;
+
+public:
+	virtual void start();
+
+	virtual void run();
+
+Q_SIGNALS:
 	void config_changed();
 
 protected:
-	sr_dev_inst *const _sdi;
 	SigSession *_owner;
 };