Added error handling to SigSession::add_decoder

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index cea71bda9cdc6ea4ab42ef42f1ed423762357362..e81d36051fa068e361eafb01c18ef3aeee02caaa 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -34,6 +34,8 @@
 
 #include <assert.h>
 
+#include <stdexcept>
+
 #include <sys/stat.h>
 
 #include <QDebug>
@@ -59,9 +61,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);
@@ -116,9 +116,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;
@@ -130,11 +130,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
@@ -169,9 +168,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()
@@ -182,12 +181,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;
@@ -198,19 +195,50 @@ boost::shared_ptr<data::Logic> SigSession::get_data()
        return _logic_data;
 }
 
-void SigSession::add_decoder(srd_decoder *const dec,
+bool SigSession::add_decoder(srd_decoder *const dec,
        std::map<const srd_probe*,
-               boost::shared_ptr<view::Signal> > probes)
+               boost::shared_ptr<view::Signal> > probes,
+       GHashTable *options)
 {
+       try
        {
                lock_guard<mutex> lock(_signals_mutex);
+
                shared_ptr<data::Decoder> decoder(
-                       new data::Decoder(dec, probes));
+                       new data::Decoder(dec, probes, options));
                shared_ptr<view::DecodeSignal> d(
-                       new view::DecodeSignal(*this, decoder));
+                       new view::DecodeSignal(*this, decoder,
+                               _decode_traces.size()));
                _decode_traces.push_back(d);
        }
+       catch(std::runtime_error e)
+       {
+               return false;
+       }
+
        signals_changed();
+
+       return true;
+}
+
+vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+{
+       lock_guard<mutex> lock(_signals_mutex);
+       return _decode_traces;
+}
+
+void SigSession::remove_decode_signal(view::DecodeSignal *signal)
+{
+       for (vector< shared_ptr<view::DecodeSignal> >::iterator i =
+               _decode_traces.begin();
+               i != _decode_traces.end();
+               i++)
+               if ((*i).get() == signal)
+               {
+                       _decode_traces.erase(i);
+                       signals_changed();
+                       return;
+               }
 }
 
 void SigSession::set_capture_state(capture_state state)
@@ -354,8 +382,7 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 
                if(sdi) {
                        for (const GSList *l = sdi->probes; l; l = l->next) {
-                               const sr_probe *const probe =
-                                       (const sr_probe *)l->data;
+                               sr_probe *const probe = (sr_probe *)l->data;
                                assert(probe);
 
                                switch(probe->type) {