Removed auto_ptr wrapping of _sampling_thread

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index e9349bba0efb1eae40e3cfa4f93dd5ddd9fc5e92..cad702d810c923f818c363940c69a78f83c099ab 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -21,11 +21,15 @@
 #include "sigsession.h"
 
 #include "devicemanager.h"
+
 #include "data/analog.h"
 #include "data/analogsnapshot.h"
+#include "data/decoder.h"
 #include "data/logic.h"
 #include "data/logicsnapshot.h"
+
 #include "view/analogsignal.h"
+#include "view/decodesignal.h"
 #include "view/logicsignal.h"
 
 #include <assert.h>
@@ -55,9 +59,7 @@ SigSession::~SigSession()
 {
        stop_capture();
 
-       if (_sampling_thread.get())
-               _sampling_thread->join();
-       _sampling_thread.reset();
+       _sampling_thread.join();
 
        if (_sdi)
                _device_manager.release_device(_sdi);
@@ -112,9 +114,9 @@ void SigSession::load_file(const string &name,
                update_signals(sdi);
                read_sample_rate(sdi);
 
-               _sampling_thread.reset(new boost::thread(
+               _sampling_thread = boost::thread(
                        &SigSession::load_session_thread_proc, this,
-                       error_handler));
+                       error_handler);
 
        } else {
                sr_input *in = NULL;
@@ -126,11 +128,10 @@ void SigSession::load_file(const string &name,
                update_signals(in->sdi);
                read_sample_rate(in->sdi);
 
-               _sampling_thread.reset(new boost::thread(
+               _sampling_thread = boost::thread(
                        &SigSession::load_input_thread_proc, this,
-                       name, in, error_handler));
+                       name, in, error_handler);
        }
-
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -165,9 +166,9 @@ void SigSession::start_capture(uint64_t record_length,
        }
 
        // Begin the session
-       _sampling_thread.reset(new boost::thread(
+       _sampling_thread = boost::thread(
                &SigSession::sample_thread_proc, this, _sdi,
-               record_length, error_handler));
+               record_length, error_handler);
 }
 
 void SigSession::stop_capture()
@@ -178,12 +179,10 @@ void SigSession::stop_capture()
        sr_session_stop();
 
        // Check that sampling stopped
-       if (_sampling_thread.get())
-               _sampling_thread->join();
-       _sampling_thread.reset();
+       _sampling_thread.join();
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 {
        lock_guard<mutex> lock(_signals_mutex);
        return _signals;
@@ -194,6 +193,27 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
        return _logic_data;
 }
 
+void SigSession::add_decoder(srd_decoder *const dec,
+       std::map<const srd_probe*,
+               boost::shared_ptr<view::Signal> > probes)
+{
+       {
+               lock_guard<mutex> lock(_signals_mutex);
+               shared_ptr<data::Decoder> decoder(
+                       new data::Decoder(dec, probes));
+               shared_ptr<view::DecodeSignal> d(
+                       new view::DecodeSignal(*this, decoder));
+               _decode_traces.push_back(d);
+       }
+       signals_changed();
+}
+
+vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+{
+       lock_guard<mutex> lock(_signals_mutex);
+       return _decode_traces;
+}
+
 void SigSession::set_capture_state(capture_state state)
 {
        lock_guard<mutex> lock(_sampling_mutex);
@@ -287,6 +307,9 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
        unsigned int logic_probe_count = 0;
        unsigned int analog_probe_count = 0;
 
+       // Clear the decode traces
+       _decode_traces.clear();
+
        // Detect what data types we will receive
        if(sdi) {
                for (const GSList *l = sdi->probes; l; l = l->next) {
@@ -503,6 +526,8 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi,
                        break;
                }
        }
+
+       signals_changed();
 }
 
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)