Added a reference to the SigSession in DecoderStack

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 9707d8d2cb605ddf61361bd48c648c4b48d65714..2c68ef80d2a58e1b06531d4dbafd7d1f32ef14e2 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -58,7 +58,9 @@ const int64_t DecoderStack::DecodeChunkLength = 4096;
 
 mutex DecoderStack::_global_decode_mutex;
 
-DecoderStack::DecoderStack(const srd_decoder *const dec) :
+DecoderStack::DecoderStack(pv::SigSession &session,
+       const srd_decoder *const dec) :
+       _session(session),
        _samples_decoded(0)
 {
        _stack.push_back(shared_ptr<decode::Decoder>(

diff --git a/pv/data/decoderstack.h b/pv/data/decoderstack.h
index 339c1e0386daf3cd1b9421b67613956564444428..6391e6a88ceb0b2d4c57e41f85591401446bf531 100644 (file)
--- a/pv/data/decoderstack.h
+++ b/pv/data/decoderstack.h
@@ -45,6 +45,8 @@ class TwoDecoderStack;
 
 namespace pv {
 
+class SigSession;
+
 namespace view {
 class LogicSignal;
 }
@@ -68,7 +70,8 @@ private:
        static const int64_t DecodeChunkLength;
 
 public:
-       DecoderStack(const srd_decoder *const decoder);
+       DecoderStack(pv::SigSession &_session,
+               const srd_decoder *const decoder);
 
        virtual ~DecoderStack();
 
@@ -106,6 +109,7 @@ signals:
        void new_decode_data();
 
 private:
+       pv::SigSession &_session;
 
        /**
         * This mutex prevents more than one decode operation occuring

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index cbb3192d6d2cffe92b24e97f15037b31d81e8ede..92118b4816711f32d06b314c56e211b327ff7e25 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -215,7 +215,7 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 
                // Create the decoder
                decoder_stack = shared_ptr<data::DecoderStack>(
-                       new data::DecoderStack(dec));
+                       new data::DecoderStack(*this, dec));
 
                // Make a list of all the probes
                std::vector<const srd_probe*> all_probes;