Moved all sr_probe modification into pv::DevInst

[pulseview.git] / pv / view / signal.h

diff --git a/pv/view/signal.h b/pv/view/signal.h
index e5e919548be0679147730823eaf113785c3871fe..25b671f4217af8e71b0b5a8314849ae31bf79a9a 100644 (file)
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -21,17 +21,21 @@
 #ifndef PULSEVIEW_PV_VIEW_SIGNAL_H
 #define PULSEVIEW_PV_VIEW_SIGNAL_H
 
+#include <boost/shared_ptr.hpp>
+
 #include <QComboBox>
 #include <QWidgetAction>
 
 #include <stdint.h>
 
-#include <libsigrok/libsigrok.h>
-
 #include "trace.h"
 
+struct sr_probe;
+
 namespace pv {
 
+class DevInst;
+
 namespace data {
 class SignalData;
 }
@@ -43,7 +47,8 @@ class Signal : public Trace
        Q_OBJECT
 
 protected:
-       Signal(pv::SigSession &session, sr_probe *const probe);
+       Signal(boost::shared_ptr<pv::DevInst> dev_inst,
+               const sr_probe *const probe);
 
 public:
        /**
@@ -51,6 +56,8 @@ public:
         */
        void set_name(QString name);
 
+       virtual boost::shared_ptr<pv::data::SignalData> data() const = 0;
+
        /**
         * Returns true if the trace is visible and enabled.
         */
@@ -70,7 +77,8 @@ private slots:
        void on_disable();
 
 protected:
-       sr_probe *const _probe;
+       boost::shared_ptr<pv::DevInst> _dev_inst;
+       const sr_probe *const _probe;
 
        QComboBox *_name_widget;
        bool _updating_name_widget;