Use libsigrok C++ bindings (patch version 7).

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

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index 0f6714cf0ce11661c58e0c264d6973e5350b6753..11b1d2bdd6a18933e26804f2203ce80836979cfd 100644 (file)
--- a/pv/view/logicsignal.h
+++ b/pv/view/logicsignal.h
@@ -27,6 +27,11 @@
 
 class QToolBar;
 
+namespace sigrok {
+       class Device;
+       class TriggerMatchType;
+}
+
 namespace pv {
 
 namespace data {
@@ -49,8 +54,8 @@ private:
        static const QColor SignalColours[10];
 
 public:
-       LogicSignal(std::shared_ptr<pv::device::DevInst> dev_inst,
-               const sr_channel *const channel,
+       LogicSignal(std::shared_ptr<sigrok::Device> device,
+               std::shared_ptr<sigrok::Channel> channel,
                std::shared_ptr<pv::data::Logic> data);
 
        virtual ~LogicSignal();
@@ -83,17 +88,18 @@ private:
 
        void init_trigger_actions(QWidget *parent);
 
-       QAction* match_action(int match);
-       int action_match(QAction *action);
+       QAction* match_action(const sigrok::TriggerMatchType *match);
+       const sigrok::TriggerMatchType *action_match(QAction *action);
        void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private Q_SLOTS:
        void on_trigger();
 
 private:
+       std::shared_ptr<sigrok::Device> _device;
        std::shared_ptr<pv::data::Logic> _data;
 
-       int _trigger_match;
+       const sigrok::TriggerMatchType *_trigger_match;
        QToolBar *_trigger_bar;
        QAction *_trigger_none;
        QAction *_trigger_rising;