X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.hpp;h=ca9f9e96f652d7247d1856567990cb0c24f9914b;hb=04b0467582d8dfa989bb38fe18bfb1be20cea456;hp=c9ebb2a69c4d00adea4e099e0c4df8de5c6a7d87;hpb=f6a93932056dab5e2f75207b65197b436d4141a5;p=pulseview.git

diff --git a/pv/data/decodesignal.hpp b/pv/data/decodesignal.hpp
index c9ebb2a6..ca9f9e96 100644
--- a/pv/data/decodesignal.hpp
+++ b/pv/data/decodesignal.hpp
@@ -26,6 +26,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include <QDebug>
 #include <QSettings>
 
 #include <libsigrokdecode/libsigrokdecode.h>
@@ -79,7 +80,7 @@ struct DecodeSegment
 	// Constructor is a no-op
 	DecodeSegment() { };
 	// Copy constructor is a no-op
-	DecodeSegment(DecodeSegment&& ds) { (void)ds; };
+	DecodeSegment(DecodeSegment&& ds) { (void)ds; qCritical() << "Empty DecodeSegment copy constructor called"; };
 
 	map<const Row*, RowData> annotation_rows;  // Note: Row is the same for all segments while RowData is not
 	pv::util::Timestamp start_time;
@@ -117,9 +118,11 @@ public:
 
 	const vector<decode::DecodeChannel> get_channels() const;
 	void auto_assign_signals(const shared_ptr<Decoder> dec);
-	void assign_signal(const uint16_t channel_id, const SignalBase *signal);
+	void assign_signal(const uint16_t channel_id, shared_ptr<const SignalBase> signal);
 	int get_assigned_signal_count() const;
 
+	void update_output_signals();
+
 	void set_initial_pin_state(const uint16_t channel_id, const int init_state);
 
 	virtual double get_samplerate() const;
@@ -201,7 +204,7 @@ private:
 	void logic_mux_proc();
 
 	void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
-		const shared_ptr<LogicSegment> input_segment);
+		const shared_ptr<const LogicSegment> input_segment);
 	void decode_proc();
 
 	void start_srd_session();
@@ -209,11 +212,13 @@ private:
 	void stop_srd_session();
 
 	void connect_input_notifiers();
+	void disconnect_input_notifiers();
 
 	void create_decode_segment();
 
 	static void annotation_callback(srd_proto_data *pdata, void *decode_signal);
 	static void binary_callback(srd_proto_data *pdata, void *decode_signal);
+	static void logic_output_callback(srd_proto_data *pdata, void *decode_signal);
 
 Q_SIGNALS:
 	void decoder_stacked(void* decoder); ///< decoder is of type decode::Decoder*
@@ -229,6 +234,7 @@ private Q_SLOTS:
 	void on_capture_state_changed(int state);
 	void on_data_cleared();
 	void on_data_received();
+	void on_input_segment_completed();
 
 	void on_annotation_visibility_changed();
 
@@ -246,7 +252,7 @@ private:
 	vector< shared_ptr<Decoder> > stack_;
 	bool stack_config_changed_;
 
-	vector<DecodeSegment> segments_;
+	deque<DecodeSegment> segments_;
 	uint32_t current_segment_id_;
 
 	mutable mutex input_mutex_, output_mutex_, decode_pause_mutex_, logic_mux_mutex_;
@@ -257,6 +263,9 @@ private:
 	atomic<bool> decode_interrupt_, logic_mux_interrupt_;
 
 	bool decode_paused_;
+
+	map<const srd_decoder*, shared_ptr<Logic>> output_logic_;
+	vector< shared_ptr<SignalBase>> output_signals_;
 };
 
 } // namespace data