X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=8cbf230d1e8f0cddae1f5c28fdfaea54a92039c4;hp=1d9f3c8ffb0dababec91fd579de2eef4b17e22e7;hb=4ca06ec34ab94ce25b96b16b749b241593858cb1;hpb=b82243f74a175f621af26aabbc0f32e2ecb125fa

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 1d9f3c8f..8cbf230d 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -79,7 +79,9 @@ const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
 void DecodeSignal::stack_decoder(const srd_decoder *decoder)
 {
 	assert(decoder);
-	stack_.push_back(make_shared<decode::Decoder>(decoder));
+	const shared_ptr<Decoder> dec = make_shared<decode::Decoder>(decoder);
+
+	stack_.push_back(dec);
 
 	// Set name if this decoder is the first in the list
 	if (stack_.size() == 1)
@@ -88,7 +90,7 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder)
 	// Include the newly created decode channels in the channel lists
 	update_channel_list();
 
-	auto_assign_signals();
+	auto_assign_signals(dec);
 	commit_decoder_channels();
 	begin_decode();
 }
@@ -263,12 +265,16 @@ const vector<data::DecodeChannel> DecodeSignal::get_channels() const
 	return channels_;
 }
 
-void DecodeSignal::auto_assign_signals()
+void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 {
 	bool new_assignment = false;
 
 	// Try to auto-select channels that don't have signals assigned yet
 	for (data::DecodeChannel &ch : channels_) {
+		// If a decoder is given, auto-assign only its channels
+		if (dec && (ch.decoder_ != dec))
+			continue;
+
 		if (ch.assigned_signal)
 			continue;
 
@@ -502,11 +508,13 @@ void DecodeSignal::restore_settings(QSettings &settings)
 
 				// Include the newly created decode channels in the channel lists
 				update_channel_list();
+				commit_decoder_channels();
 				break;
 			}
 		}
 
 		settings.endGroup();
+		channels_updated();
 	}
 
 	// Restore channel mapping
@@ -749,12 +757,24 @@ void DecodeSignal::query_input_metadata()
 	// TODO Currently we assume all channels have the same sample rate
 	// and start time
 	bool samplerate_valid = false;
+	data::DecodeChannel *any_channel;
+	shared_ptr<Logic> logic_data;
 
-	auto any_channel = find_if(channels_.begin(), channels_.end(),
-		[](data::DecodeChannel ch) { return ch.assigned_signal; });
+	do {
+		any_channel = &(*find_if(channels_.begin(), channels_.end(),
+			[](data::DecodeChannel ch) { return ch.assigned_signal; }));
 
-	shared_ptr<Logic> logic_data =
-		any_channel->assigned_signal->logic_data();
+		logic_data = any_channel->assigned_signal->logic_data();
+
+		if (!logic_data) {
+			// Wait until input data is available or an interrupt was requested
+			unique_lock<mutex> input_wait_lock(input_mutex_);
+			decode_input_cond_.wait(input_wait_lock);
+		}
+	} while (!logic_data && !decode_interrupt_);
+
+	if (decode_interrupt_)
+		return;
 
 	do {
 		if (!logic_data->logic_segments().empty()) {
@@ -912,7 +932,7 @@ void DecodeSignal::connect_input_notifiers()
 void DecodeSignal::annotation_callback(srd_proto_data *pdata, void *decode_signal)
 {
 	assert(pdata);
-	assert(decoder);
+	assert(decode_signal);
 
 	DecodeSignal *const ds = (DecodeSignal*)decode_signal;
 	assert(ds);