X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=5755c80e11aa0dde925b50b5713457e08142d3fa;hb=628b45cc0ba7ac38ac6a003fedbbc746f15dd724;hp=cd0f6faa4b3e472a7b2ca70378b363ea0a60a5e8;hpb=c0c3e62a897ae31592855da7fbd0a6d0444c2581;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index cd0f6faa..5755c80e 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -30,6 +30,7 @@
 
 #include <libsigrokdecode/libsigrokdecode.h>
 
+#include <pv/data/decode/decoder.hpp>
 #include <pv/data/decode/row.hpp>
 #include <pv/data/decode/rowdata.hpp>
 #include <pv/data/signalbase.hpp>
@@ -59,22 +60,17 @@ class LogicSegment;
 class SignalBase;
 class SignalData;
 
-struct DecodeChannel
+struct DecodeBinaryDataChunk
 {
-	uint16_t id;     ///< Global numerical ID for the decode channels in the stack
-	uint16_t bit_id; ///< Tells which bit within a sample represents this channel
-	const bool is_optional;
-	const pv::data::SignalBase *assigned_signal;
-	const QString name, desc;
-	int initial_pin_state;
-	const shared_ptr<pv::data::decode::Decoder> decoder_;
-	const srd_channel *pdch_;
+	vector<uint8_t> data;
+	uint64_t sample;   ///< Number of the sample where this data was provided by the PD
 };
 
-struct DecodeBinaryData
+struct DecodeBinaryClass
 {
-	vector<uint8_t> data;
-	uint64_t sample;   ///< Number of the sample where this data was provided by the PD
+	const decode::Decoder* decoder;
+	const decode::DecodeBinaryClassInfo* info;
+	vector<DecodeBinaryDataChunk> chunks;
 };
 
 struct DecodeSegment
@@ -83,7 +79,7 @@ struct DecodeSegment
 	pv::util::Timestamp start_time;
 	double samplerate;
 	int64_t samples_decoded_incl, samples_decoded_excl;
-	vector<DecodeBinaryData> binary_data;
+	vector<DecodeBinaryClass> binary_classes;
 };
 
 class DecodeSignal : public SignalBase
@@ -113,7 +109,7 @@ public:
 	bool is_paused() const;
 	QString error_message() const;
 
-	const vector<data::DecodeChannel> get_channels() const;
+	const vector<data::decode::DecodeChannel> get_channels() const;
 	void auto_assign_signals(const shared_ptr<pv::data::decode::Decoder> dec);
 	void assign_signal(const uint16_t channel_id, const SignalBase *signal);
 	int get_assigned_signal_count() const;
@@ -162,11 +158,16 @@ public:
 		vector<pv::data::decode::Annotation> &dest,
 		uint32_t segment_id, uint64_t start_sample, uint64_t end_sample) const;
 
-	uint32_t get_binary_data_chunk_count(uint32_t segment_id) const;
-	void get_binary_data_chunk(uint32_t segment_id, uint32_t chunk_id,
-		const vector<uint8_t> **dest, uint64_t *size);
-	void get_binary_data_chunks_merged(uint32_t segment_id,
-		uint64_t start_sample, uint64_t end_sample, vector<uint8_t> *dest) const;
+	uint32_t get_binary_data_chunk_count(uint32_t segment_id,
+		const data::decode::Decoder* dec, uint8_t bin_class_id) const;
+	void get_binary_data_chunk(uint32_t segment_id, const data::decode::Decoder* dec,
+		uint8_t bin_class_id, uint32_t chunk_id, const vector<uint8_t> **dest,
+		uint64_t *size);
+	void get_binary_data_chunks_merged(uint32_t segment_id, const data::decode::Decoder* dec,
+		uint8_t bin_class_id, uint64_t start_sample, uint64_t end_sample,
+		vector<uint8_t> *dest) const;
+	const DecodeBinaryClass* get_binary_data_class(uint32_t segment_id,
+		const data::decode::Decoder* dec, uint8_t bin_class_id) const;
 
 	virtual void save_settings(QSettings &settings) const;
 
@@ -204,8 +205,10 @@ private:
 	static void binary_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
+	void decoder_stacked(void* decoder); ///< decoder is of type decode::Decoder*
+	void decoder_removed(void* decoder); ///< decoder is of type decode::Decoder*
 	void new_annotations(); // TODO Supply segment for which they belong to
-	void new_binary_data(uint32_t segment_id);
+	void new_binary_data(unsigned int segment_id, void* decoder, unsigned int bin_class_id);
 	void decode_reset();
 	void decode_finished();
 	void channels_updated();
@@ -218,7 +221,7 @@ private Q_SLOTS:
 private:
 	pv::Session &session_;
 
-	vector<data::DecodeChannel> channels_;
+	vector<data::decode::DecodeChannel> channels_;
 
 	struct srd_session *srd_session_;