Renamed pv::data::Decoder to DecoderStack

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index aeb6d22072f55f6bc49c04dd389295fd852b5c6a..a6a2875e62657ca7dacc458808f854fc6dfbe88c 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -26,12 +26,12 @@
 
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
-#include "data/decoder.h"
+#include "data/decoderstack.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
 
 #include "view/analogsignal.h"
-#include "view/decodesignal.h"
+#include "view/decodetrace.h"
 #include "view/logicsignal.h"
 
 #include <assert.h>
@@ -208,7 +208,7 @@ bool SigSession::add_decoder(srd_decoder *const dec)
                lock_guard<mutex> lock(_signals_mutex);
 
                // Create the decoder
-               shared_ptr<data::Decoder> decoder(new data::Decoder(dec));
+               shared_ptr<data::DecoderStack> decoder(new data::DecoderStack(dec));
 
                // Auto select the initial probes
                for(const GSList *i = dec->probes; i; i = i->next)
@@ -227,8 +227,8 @@ bool SigSession::add_decoder(srd_decoder *const dec)
                decoder->set_probes(probes);
 
                // Create the decode signal
-               shared_ptr<view::DecodeSignal> d(
-                       new view::DecodeSignal(*this, decoder,
+               shared_ptr<view::DecodeTrace> d(
+                       new view::DecodeTrace(*this, decoder,
                                _decode_traces.size()));
                _decode_traces.push_back(d);
        }
@@ -242,15 +242,15 @@ bool SigSession::add_decoder(srd_decoder *const dec)
        return true;
 }
 
-vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+vector< shared_ptr<view::DecodeTrace> > SigSession::get_decode_signals() const
 {
        lock_guard<mutex> lock(_signals_mutex);
        return _decode_traces;
 }
 
-void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+void SigSession::remove_decode_signal(view::DecodeTrace *signal)
 {
-       for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+       for (vector< shared_ptr<view::DecodeTrace> >::iterator i =
                _decode_traces.begin();
                i != _decode_traces.end();
                i++)