}
}
- if (match) {
+ // Prevent using a signal more than once as D1 would match e.g. D1 and D10
+ bool signal_not_already_used = true;
+ for (decode::DecodeChannel& ch : channels_)
+ if (ch.assigned_signal && (ch.assigned_signal == match))
+ signal_not_already_used = false;
+
+ if (match && signal_not_already_used) {
ch.assigned_signal = match;
new_assignment = true;
}
logic_mux_data_->push_segment(output_segment);
output_segment->set_samplerate(get_input_samplerate(segment_id));
+ } else {
+ // Wait for more input data if we're processing the currently last segment
+ unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
+ logic_mux_cond_.wait(logic_mux_lock);
}
}
-
- if (segment_id == (get_input_segment_count() - 1)) {
- // Wait for more input data if we're processing the currently last segment
- unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
- logic_mux_cond_.wait(logic_mux_lock);
- }
}
} while (!logic_mux_interrupt_);
}
// All segments have been processed
if (!decode_interrupt_)
decode_finished();
+
+ // Wait for more input data
+ unique_lock<mutex> input_wait_lock(input_mutex_);
+ decode_input_cond_.wait(input_wait_lock);
}
}
- if (current_segment_id_ == (logic_mux_data_->logic_segments().size() - 1)) {
- // Wait for more input data if we're processing the currently last segment
- unique_lock<mutex> input_wait_lock(input_mutex_);
- decode_input_cond_.wait(input_wait_lock);
- }
}
} while (!decode_interrupt_);
}