Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / data / decode / decoder.h

diff --git a/pv/data/decode/decoder.h b/pv/data/decode/decoder.h
index 99b21c574e43b682e18893e13bb111a9b2b9e9d0..dffefab22e2119f6a44fc7a2dbe869196320d431 100644 (file)
--- a/pv/data/decode/decoder.h
+++ b/pv/data/decode/decoder.h
@@ -22,6 +22,7 @@
 #define PULSEVIEW_PV_DATA_DECODE_DECODER_H
 
 #include <map>
 #define PULSEVIEW_PV_DATA_DECODE_DECODER_H
 
 #include <map>

+#include <set>

 
 #include <boost/shared_ptr.hpp>
 
 
 #include <boost/shared_ptr.hpp>
 


@@ -29,7 +30,7 @@
 
 struct srd_decoder;
 struct srd_decoder_inst;
 
 struct srd_decoder;
 struct srd_decoder_inst;

-struct srd_probe;
+struct srd_channel;

 struct srd_session;
 
 namespace pv {
 struct srd_session;
 
 namespace pv {


@@ -39,6 +40,9 @@ class LogicSignal;
 }
 
 namespace data {
 }
 
 namespace data {

+
+class Logic;
+

 namespace decode {
 
 class Decoder
 namespace decode {
 
 class Decoder


@@ -50,21 +54,31 @@ public:
 
        const srd_decoder* decoder() const;
 
 
        const srd_decoder* decoder() const;
 

-       const std::map<const srd_probe*,
-               boost::shared_ptr<view::LogicSignal> >& probes() const;
-       void set_probes(std::map<const srd_probe*,
+       bool shown() const;
+       void show(bool show = true);
+
+       const std::map<const srd_channel*,
+               boost::shared_ptr<view::LogicSignal> >& channels() const;
+       void set_probes(std::map<const srd_channel*,

                boost::shared_ptr<view::LogicSignal> > probes);
 
        const std::map<std::string, GVariant*>& options() const;
 
        void set_option(const char *id, GVariant *value);
 
                boost::shared_ptr<view::LogicSignal> > probes);
 
        const std::map<std::string, GVariant*>& options() const;
 
        void set_option(const char *id, GVariant *value);
 

+       bool have_required_probes() const;
+

        srd_decoder_inst* create_decoder_inst(
        srd_decoder_inst* create_decoder_inst(

-               srd_session *const session) const;
+               srd_session *session, int unit_size) const;
+
+       std::set< boost::shared_ptr<pv::data::Logic> > get_data();      

 
 private:
        const srd_decoder *const _decoder;
 
 private:
        const srd_decoder *const _decoder;

-       std::map<const srd_probe*, boost::shared_ptr<pv::view::LogicSignal> >
+
+       bool _shown;
+
+       std::map<const srd_channel*, boost::shared_ptr<pv::view::LogicSignal> >

                _probes;
        std::map<std::string, GVariant*> _options;
 };
                _probes;
        std::map<std::string, GVariant*> _options;
 };