Moved decoder config into the popup

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

diff --git a/pv/data/decoder.h b/pv/data/decoder.h
index b8608d2cc4290ed712722ba1e677e6383e96fb03..72ccd2ec58622a9119f6e3f15ddbd2d1fa45e831 100644 (file)
--- a/pv/data/decoder.h
+++ b/pv/data/decoder.h
@@ -66,14 +66,20 @@ private:
        static const int64_t DecodeChunkLength;
 
 public:
-       Decoder(const srd_decoder *const decoder,
-               std::map<const srd_probe*,
-                       boost::shared_ptr<pv::view::LogicSignal> > probes,
-               GHashTable *options);
+       Decoder(const srd_decoder *const decoder);
 
        virtual ~Decoder();
 
-       const srd_decoder* get_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*,
+               boost::shared_ptr<view::LogicSignal> > probes);
+
+       const GHashTable* options() const;
+
+       void set_option(const char *id, GVariant *value);
 
        const std::vector< boost::shared_ptr<pv::view::decode::Annotation> >
                annotations() const;
@@ -85,8 +91,6 @@ public:
 private:
        void begin_decode();
 
-       void init_decoder();
-
        void decode_proc(boost::shared_ptr<data::Logic> data);
 
        static void annotation_callback(srd_proto_data *pdata,