DecoderStack: Fix "data may be unitialized" error

[pulseview.git] / pv / data / decoderstack.cpp

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index b79326d83363ed70efa20580a62bdf4068dcddbe..648b4cf57917a0cf3ea0a608942b1313c88719a6 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -55,7 +55,7 @@ namespace data {
 const double DecoderStack::DecodeMargin = 1.0;
 const double DecoderStack::DecodeThreshold = 0.2;
 const int64_t DecoderStack::DecodeChunkLength = 4096;
-const unsigned int DecoderStack::DecodeNotifyPeriod = 65536;
+const unsigned int DecoderStack::DecodeNotifyPeriod = 1024;
 
 mutex DecoderStack::global_srd_mutex_;
 
@@ -191,9 +191,6 @@ void DecoderStack::clear()
 
 void DecoderStack::begin_decode()
 {
-       shared_ptr<pv::view::LogicSignal> logic_signal;
-       shared_ptr<pv::data::Logic> data;
-
        if (decode_thread_.joinable()) {
                interrupt_ = true;
                input_cond_.notify_one();
@@ -241,11 +238,14 @@ void DecoderStack::begin_decode()
 
        // We get the logic data of the first channel in the list.
        // This works because we are currently assuming all
-       // LogicSignals have the same data/segment
+       // logic signals have the same data/segment
+       pv::data::SignalBase *signalbase;
+       pv::data::Logic *data = nullptr;
+
        for (const shared_ptr<decode::Decoder> &dec : stack_)
                if (dec && !dec->channels().empty() &&
-                       ((logic_signal = (*dec->channels().begin()).second)) &&
-                       ((data = logic_signal->logic_data())))
+                       ((signalbase = (*dec->channels().begin()).second.get())) &&
+                       ((data = signalbase->logic_data().get())))
                        break;
 
        if (!data)
@@ -272,7 +272,7 @@ uint64_t DecoderStack::max_sample_count() const
 {
        uint64_t max_sample_count = 0;
 
-       for (const auto & row : rows_)
+       for (const auto& row : rows_)
                max_sample_count = max(max_sample_count,
                        row.second.get_max_sample());