(conversion_type_ == A2LConversionBySchmittTrigger)));
}
-void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
- LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample)
+void SignalBase::convert_single_segment_range(shared_ptr<AnalogSegment> asegment,
+ shared_ptr<LogicSegment> lsegment, uint64_t start_sample, uint64_t end_sample)
{
if (end_sample > start_sample) {
tie(min_value_, max_value_) = asegment->get_min_max();
lsegment->append_payload(logic->data_pointer(), logic->data_length());
samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
+
i += ConversionBlockSize;
}
}
}
-void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+void SignalBase::convert_single_segment(shared_ptr<AnalogSegment> asegment,
+ shared_ptr<LogicSegment> lsegment)
{
uint64_t start_sample, end_sample, old_end_sample;
start_sample = end_sample = 0;
uint32_t segment_id = 0;
- AnalogSegment *asegment = analog_data->analog_segments().front().get();
+ shared_ptr<AnalogSegment> asegment = analog_data->analog_segments().front();
assert(asegment);
const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
logic_data->push_segment(new_segment);
}
- LogicSegment *lsegment = logic_data->logic_segments().front().get();
+ shared_ptr<LogicSegment> lsegment = logic_data->logic_segments().front();
assert(lsegment);
do {
// Only advance to next segment if the current input segment is complete
if (asegment->is_complete() &&
analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
+
// There are more segments to process
segment_id++;
try {
- asegment = analog_data->analog_segments().at(segment_id).get();
+ asegment = analog_data->analog_segments().at(segment_id);
} catch (out_of_range&) {
qDebug() << "Conversion error for" << name() << ": no analog segment" \
<< segment_id << ", segments size is" << analog_data->analog_segments().size();
*logic_data.get(), segment_id, 1, asegment->samplerate());
logic_data->push_segment(new_segment);
- lsegment = logic_data->logic_segments().back().get();
- } else {
- // No more samples/segments to process, wait for data or interrupt
- if (!conversion_interrupt_) {
- unique_lock<mutex> input_lock(conversion_input_mutex_);
- conversion_input_cond_.wait(input_lock);
- }
+ lsegment = logic_data->logic_segments().back();
+ }
+
+ // No more samples/segments to process, wait for data or interrupt
+ if (!conversion_interrupt_) {
+ unique_lock<mutex> input_lock(conversion_input_mutex_);
+ conversion_input_cond_.wait(input_lock);
}
} while (!conversion_interrupt_);
}
if (converted_data_)
converted_data_->clear();
+
samples_cleared();
conversion_interrupt_ = false;
- conversion_thread_ = std::thread(
- &SignalBase::conversion_thread_proc, this);
+ conversion_thread_ = std::thread(&SignalBase::conversion_thread_proc, this);
}
void SignalBase::stop_conversion()