Enumerate probes when session is loaded

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index cbdbac07c2031d6232af8089bbf51b7f25d403ac..41e31a2802a0af68c2d0505e2f3e3384ca96a010 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -79,7 +79,7 @@ void SigSession::set_device(struct sr_dev_inst *sdi)
        if (sdi)
                _device_manager.use_device(sdi, this);
        _sdi = sdi;
-       update_signals();
+       update_signals(sdi);
 }
 
 void SigSession::release_device(struct sr_dev_inst *sdi)
@@ -88,16 +88,45 @@ void SigSession::release_device(struct sr_dev_inst *sdi)
 
        assert(_capture_state == Stopped);
        _sdi = NULL;
-       update_signals();
+       update_signals(NULL);
 }
 
 void SigSession::load_file(const string &name,
        function<void (const QString)> error_handler)
 {
        stop_capture();
-       _sampling_thread.reset(new boost::thread(
-               &SigSession::load_thread_proc, this, name,
-               error_handler));
+
+       if (sr_session_load(name.c_str()) == SR_OK) {
+               GSList *devlist = NULL;
+               sr_session_dev_list(&devlist);
+
+               if (!devlist || !devlist->data ||
+                       sr_session_start() != SR_OK) {
+                       error_handler(tr("Failed to start session."));
+                       return;
+               }
+
+               update_signals((sr_dev_inst*)devlist->data);
+               g_slist_free(devlist);
+
+               _sampling_thread.reset(new boost::thread(
+                       &SigSession::load_session_thread_proc, this,
+                       error_handler));
+
+       } else {
+               sr_input *in = NULL;
+
+               if (!(in = load_input_file_format(name.c_str(),
+                       error_handler)))
+                       return;
+
+               update_signals(in->sdi);
+
+               _sampling_thread.reset(new boost::thread(
+                       &SigSession::load_input_thread_proc, this,
+                       name, in, error_handler));
+       }
+
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -246,7 +275,7 @@ sr_input* SigSession::load_input_file_format(const string &filename,
        return in;
 }
 
-void SigSession::update_signals()
+void SigSession::update_signals(const sr_dev_inst *const sdi)
 {
        assert(_capture_state == Stopped);
 
@@ -255,8 +284,8 @@ void SigSession::update_signals()
        unsigned int analog_probe_count = 0;
 
        // Detect what data types we will receive
-       if(_sdi) {
-               for (const GSList *l = _sdi->probes; l; l = l->next) {
+       if(sdi) {
+               for (const GSList *l = sdi->probes; l; l = l->next) {
                        const sr_probe *const probe = (const sr_probe *)l->data;
                        if (!probe->enabled)
                                continue;
@@ -297,8 +326,8 @@ void SigSession::update_signals()
 
                _signals.clear();
 
-               if(_sdi) {
-                       for (const GSList *l = _sdi->probes; l; l = l->next) {
+               if(sdi) {
+                       for (const GSList *l = sdi->probes; l; l = l->next) {
                                const sr_probe *const probe =
                                        (const sr_probe *)l->data;
                                assert(probe);
@@ -338,29 +367,38 @@ bool SigSession::is_trigger_enabled() const
        return false;
 }
 
-void SigSession::load_thread_proc(const string name,
+void SigSession::load_session_thread_proc(
        function<void (const QString)> error_handler)
 {
-       sr_input *in = NULL;
+       (void)error_handler;
 
-       if (sr_session_load(name.c_str()) == SR_OK) {
-               if (sr_session_start() != SR_OK) {
-                       error_handler(tr("Failed to start session."));
-                       return;
-               }
-       }
-       else if(!(in = load_input_file_format(name.c_str(), error_handler)))
-               return;
+       sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+
+       set_capture_state(Running);
+
+       sr_session_run();
+
+       sr_session_destroy();
+       set_capture_state(Stopped);
+
+       // Confirm that SR_DF_END was received
+       assert(!_cur_logic_snapshot);
+       assert(!_cur_analog_snapshot);
+}
+
+void SigSession::load_input_thread_proc(const string name,
+       sr_input *in, function<void (const QString)> error_handler)
+{
+       (void)error_handler;
+
+       assert(in);
+       assert(in->format);
 
        sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
 
        set_capture_state(Running);
 
-       if(in) {
-               assert(in->format);
-               in->format->loadfile(in, name.c_str());
-       } else
-               sr_session_run();
+       in->format->loadfile(in, name.c_str());
 
        sr_session_destroy();
        set_capture_state(Stopped);