X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=55742c6070e5a020c00042b2c8894e744b13986e;hb=72486b789078f024e4f3404f81118c03b03e2b70;hp=1b655662bcb707dfe5fd83dbc847164e81bc04a2;hpb=9f97b3576f527239594ea0accb82a4087147c746;p=pulseview.git

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 1b65566..55742c6 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -23,13 +23,13 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <vector>
 
 #include <glib.h>
 
 using std::map;
-using std::set;
-using std::shared_ptr;
 using std::string;
+using std::vector;
 
 struct srd_decoder;
 struct srd_decoder_inst;
@@ -40,6 +40,7 @@ namespace pv {
 
 namespace data {
 
+struct DecodeChannel;
 class Logic;
 class SignalBase;
 
@@ -57,28 +58,28 @@ public:
 	bool shown() const;
 	void show(bool show = true);
 
-	const map<const srd_channel*,
-		shared_ptr<data::SignalBase> >& channels() const;
-	void set_channels(map<const srd_channel*,
-		shared_ptr<data::SignalBase> > channels);
+	const vector<data::DecodeChannel*>& channels() const;
+	void set_channels(vector<data::DecodeChannel*> channels);
 
 	const map<string, GVariant*>& options() const;
 
 	void set_option(const char *id, GVariant *value);
 
-	bool have_required_channels() const;
+	void apply_all_options();
 
-	srd_decoder_inst* create_decoder_inst(srd_session *session) const;
+	bool have_required_channels() const;
 
-	set< shared_ptr<pv::data::Logic> > get_data();
+	srd_decoder_inst* create_decoder_inst(srd_session *session);
+	void invalidate_decoder_inst();
 
 private:
 	const srd_decoder *const decoder_;
 
 	bool shown_;
 
-	map<const srd_channel*, shared_ptr<pv::data::SignalBase> > channels_;
+	vector<data::DecodeChannel*> channels_;
 	map<string, GVariant*> options_;
+	srd_decoder_inst *decoder_inst_;
 };
 
 } // namespace decode