Renamed get_samplerate to samplerate

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

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 2817d29205cc8ee825c72ff049e5775ab6b638cb..6d5e4e19440a4f154abb8fceb1e0824ccbf83b8f 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -47,7 +47,8 @@ const int64_t DecoderStack::DecodeChunkLength = 4096;
 
 mutex DecoderStack::_global_decode_mutex;
 
-DecoderStack::DecoderStack(const srd_decoder *const dec)
+DecoderStack::DecoderStack(const srd_decoder *const dec) :
+       _samples_decoded(0)
 {
        _stack.push_back(shared_ptr<decode::Decoder>(
                new decode::Decoder(dec)));
@@ -71,6 +72,28 @@ void DecoderStack::push(boost::shared_ptr<decode::Decoder> decoder)
        _stack.push_back(decoder);
 }
 
+void DecoderStack::remove(int index)
+{
+       using pv::data::decode::Decoder;
+
+       assert(index >= 0);
+       assert(index < (int)_stack.size());
+
+       // Find the decoder in the stack
+       list< shared_ptr<Decoder> >::iterator iter = _stack.begin();
+       for(int i = 0; i < index; i++, iter++)
+               assert(iter != _stack.end());
+
+       // Delete the element
+       _stack.erase(iter);
+}
+
+int64_t DecoderStack::samples_decoded() const
+{
+       lock_guard<mutex> decode_lock(_mutex);
+       return _samples_decoded;
+}
+
 const vector< shared_ptr<view::decode::Annotation> >
        DecoderStack::annotations() const
 {
@@ -92,6 +115,8 @@ void DecoderStack::begin_decode()
        _decode_thread.interrupt();
        _decode_thread.join();
 
+       _samples_decoded = 0;
+
        _annotations.clear();
 
        // We get the logic data of the first probe in the list.
@@ -100,7 +125,7 @@ void DecoderStack::begin_decode()
        BOOST_FOREACH (const shared_ptr<decode::Decoder> &dec, _stack)
                if (dec && !dec->probes().empty() &&
                        ((logic_signal = (*dec->probes().begin()).second)) &&
-                       ((data = logic_signal->data())))
+                       ((data = logic_signal->logic_data())))
                        break;
 
        if (!data)
@@ -108,7 +133,7 @@ void DecoderStack::begin_decode()
 
        // Get the samplerate and start time
        _start_time = data->get_start_time();
-       _samplerate = data->get_samplerate();
+       _samplerate = data->samplerate();
        if (_samplerate == 0.0)
                _samplerate = 1.0;
 
@@ -116,8 +141,16 @@ void DecoderStack::begin_decode()
                data);
 }
 
-void DecoderStack::clear_snapshots()
+void DecoderStack::clear()
+{
+       _annotations.clear();
+}
+
+uint64_t DecoderStack::get_max_sample_count() const
 {
+       if (_annotations.empty())
+               return 0;
+       return _annotations.back()->end_sample();
 }
 
 void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@ -184,6 +217,11 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
                        _error_message = tr("Failed to initialise decoder");
                        break;
                }
+
+               {
+                       lock_guard<mutex> lock(_mutex);
+                       _samples_decoded = chunk_end;
+               }
        }
 
        // Destroy the session