Rename 'probe' to 'channel' everywhere.

[pulseview.git] / pv / device / devinst.h

diff --git a/pv/device/devinst.h b/pv/device/devinst.h
index 9098027eb84e0674da978a65c38e67df3485c36f..5a994372d347ca76dca32d151760a6b735d358a9 100644 (file)
--- a/pv/device/devinst.h
+++ b/pv/device/devinst.h
@@ -21,10 +21,9 @@
 #ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
 #define PULSEVIEW_PV_DEVICE_DEVINST_H
 
+#include <memory>
 #include <string>
 
-#include <boost/shared_ptr.hpp>
-
 #include <QObject>
 
 #include <glib.h>
@@ -32,12 +31,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 +45,26 @@ 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);
+       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 +74,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;
 };