if (conversion_is_a2l()) {
analog_data = dynamic_pointer_cast<Analog>(data_);
- if (analog_data->analog_segments().size() == 0)
- return;
+ if (analog_data->analog_segments().size() == 0) {
+ unique_lock<mutex> input_lock(conversion_input_mutex_);
+ conversion_input_cond_.wait(input_lock);
+ }
} else
// Currently, we only handle A2L conversions
return;
+ // If we had to wait for input data, we may have been notified to terminate
+ if (conversion_interrupt_)
+ return;
+
uint32_t segment_id = 0;
AnalogSegment *asegment = analog_data->analog_segments().front().get();
// Create the initial logic data segment if needed
if (logic_data->logic_segments().size() == 0) {
shared_ptr<LogicSegment> new_segment =
- make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
+ make_shared<LogicSegment>(*logic_data.get(), 0, 1, asegment->samplerate());
logic_data->push_segment(new_segment);
}
return;
}
- shared_ptr<LogicSegment> new_segment =
- make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
+ shared_ptr<LogicSegment> new_segment = make_shared<LogicSegment>(
+ *logic_data.get(), segment_id, 1, asegment->samplerate());
logic_data->push_segment(new_segment);
lsegment = logic_data->logic_segments().back().get();