X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=a17ea693aaa89d67ca3859751529e84b75b42eb2;hp=6c1937897d936e1adb971e8e85512e4bb742611f;hb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;hpb=1774d669023d26029bbc19ac6c3f5a564ab1fed4 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 6c193789..a17ea693 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -56,7 +56,8 @@ DecodeSignal::DecodeSignal(pv::Session &session) : srd_session_(nullptr), logic_mux_data_invalid_(false), stack_config_changed_(true), - current_segment_id_(0) + current_segment_id_(0), + error_message_("") { connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); @@ -858,7 +859,7 @@ uint32_t DecodeSignal::get_input_segment_count() const return (no_signals_assigned ? 0 : count); } -uint32_t DecodeSignal::get_input_samplerate(uint32_t segment_id) const +double DecodeSignal::get_input_samplerate(uint32_t segment_id) const { double samplerate = 0; @@ -1128,7 +1129,6 @@ void DecodeSignal::logic_mux_proc() logic_mux_data_->push_segment(output_segment); output_segment->set_samplerate(get_input_samplerate(segment_id)); - } else { // All segments have been processed logic_mux_data_invalid_ = false;