Fix double-free issue in File::create

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

diff --git a/pv/device/devinst.h b/pv/device/devinst.h
index 7f467cf442be629771fa776e327e2b9e9dab9f49..1e0850c8cd9ae8089e2e98df7e65a97f3feae84f 100644 (file)
--- a/pv/device/devinst.h
+++ b/pv/device/devinst.h
@@ -21,6 +21,7 @@
 #ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
 #define PULSEVIEW_PV_DEVICE_DEVINST_H
 
+#include <map>
 #include <memory>
 #include <string>
 
@@ -34,9 +35,9 @@ struct sr_dev_inst;
 struct sr_channel;
 struct sr_channel_group;
 
-namespace pv {
+#include <pv/sigsession.h>
 
-class SigSession;
+namespace pv {
 
 namespace device {
 
@@ -58,13 +59,15 @@ public:
 
        virtual std::string format_device_title() const = 0;
 
+       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_channel_group *group, int key, GVariant *data);
 
        GVariant* list_config(const sr_channel_group *group, int key);
 
-       void enable_probe(const sr_channel *probe, bool enable = true);
+       void enable_channel(const sr_channel *channel, bool enable = true);
 
        /**
         * @brief Gets the sample limit from the driver.
@@ -81,7 +84,7 @@ public:
 
        virtual void run();
 
-signals:
+Q_SIGNALS:
        void config_changed();
 
 protected: