Ported pv::prop::binding::DeviceOptions to GVariants

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index b2670b6fbfcc908089ae7cc5b52704773ac33db3..94867959f184fcb547b40463e84f97fccbfea5f6 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -27,10 +27,10 @@
 #include "view/analogsignal.h"
 #include "view/logicsignal.h"
 
-#include <QDebug>
-
 #include <assert.h>
 
+#include <QDebug>
+
 using namespace boost;
 using namespace std;
 
@@ -58,11 +58,13 @@ SigSession::~SigSession()
        _session = NULL;
 }
 
-void SigSession::load_file(const string &name)
+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));
+               &SigSession::load_thread_proc, this, name,
+               error_handler));
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -72,13 +74,29 @@ SigSession::capture_state SigSession::get_capture_state() const
 }
 
 void SigSession::start_capture(struct sr_dev_inst *sdi,
-       uint64_t record_length)
+       uint64_t record_length,
+       function<void (const QString)> error_handler)
 {
        stop_capture();
 
+       // Check that at least one probe is enabled
+       const GSList *l;
+       for (l = sdi->probes; l; l = l->next) {
+               sr_probe *const probe = (sr_probe*)l->data;
+               assert(probe);
+               if (probe->enabled)
+                       break;
+       }
+
+       if (!l) {
+               error_handler(tr("No probes enabled."));
+               return;
+       }
+
+       // Begin the session
        _sampling_thread.reset(new boost::thread(
                &SigSession::sample_thread_proc, this, sdi,
-               record_length));
+               record_length, error_handler));
 }
 
 void SigSession::stop_capture()
@@ -112,17 +130,18 @@ void SigSession::set_capture_state(capture_state state)
        capture_state_changed(state);
 }
 
-void SigSession::load_thread_proc(const string name)
+void SigSession::load_thread_proc(const string name,
+       function<void (const QString)> error_handler)
 {
        if (sr_session_load(name.c_str()) != SR_OK) {
-               qDebug() << "Failed to load file.";
+               error_handler(tr("Failed to load file."));
                return;
        }
 
        sr_session_datafeed_callback_add(data_feed_in_proc);
 
        if (sr_session_start() != SR_OK) {
-               qDebug() << "Failed to start session.";
+               error_handler(tr("Failed to start session."));
                return;
        }
 
@@ -135,29 +154,32 @@ void SigSession::load_thread_proc(const string name)
 }
 
 void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
-       uint64_t record_length)
+       uint64_t record_length,
+       function<void (const QString)> error_handler)
 {
        assert(sdi);
+       assert(error_handler);
 
        sr_session_new();
        sr_session_datafeed_callback_add(data_feed_in_proc);
 
        if (sr_session_dev_add(sdi) != SR_OK) {
-               qDebug() << "Failed to use device.";
+               error_handler(tr("Failed to use device."));
                sr_session_destroy();
                return;
        }
 
        // Set the sample limit
        if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
-               &record_length) != SR_OK) {
-               qDebug() << "Failed to configure time-based sample limit.";
+               g_variant_new_uint64(record_length)) != SR_OK) {
+               error_handler(tr("Failed to configure "
+                       "time-based sample limit."));
                sr_session_destroy();
                return;
        }
 
        if (sr_session_start() != SR_OK) {
-               qDebug() << "Failed to start session.";
+               error_handler(tr("Failed to start session."));
                return;
        }
 
@@ -172,7 +194,8 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
        shared_ptr<view::Signal> signal;
-       uint64_t *sample_rate = NULL;
+       GVariant *gvar;
+       uint64_t sample_rate = 0;
        unsigned int logic_probe_count = 0;
        unsigned int analog_probe_count = 0;
 
@@ -197,8 +220,10 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
        assert(sdi->driver);
 
        const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
-               (const void**)&sample_rate, sdi);
+               &gvar, sdi);
        assert(ret == SR_OK);
+       sample_rate = g_variant_get_uint64(gvar);
+       g_variant_unref(gvar);
 
        // Create data containers for the coming data snapshots
        {
@@ -206,12 +231,12 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
 
                if (logic_probe_count != 0) {
                        _logic_data.reset(new data::Logic(
-                               logic_probe_count, *sample_rate));
+                               logic_probe_count, sample_rate));
                        assert(_logic_data);
                }
 
                if (analog_probe_count != 0) {
-                       _analog_data.reset(new data::Analog(*sample_rate));
+                       _analog_data.reset(new data::Analog(sample_rate));
                        assert(_analog_data);
                }
        }
@@ -239,7 +264,7 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
                        case SR_PROBE_ANALOG:
                                signal = shared_ptr<view::Signal>(
                                        new view::AnalogSignal(probe->name,
-                                               _analog_data));
+                                               _analog_data, probe->index));
                                break;
                        }
 
@@ -272,10 +297,15 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi,
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 {
        lock_guard<mutex> lock(_data_mutex);
-       if (!_cur_logic_snapshot)
+
+       if (!_logic_data)
        {
-               assert(_logic_data);
+               qDebug() << "Unexpected logic packet";
+               return;
+       }
 
+       if (!_cur_logic_snapshot)
+       {
                // Create a new data snapshot
                _cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
                        new data::LogicSnapshot(logic));
@@ -293,10 +323,15 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 {
        lock_guard<mutex> lock(_data_mutex);
-       if (!_cur_analog_snapshot)
+
+       if(!_analog_data)
        {
-               assert(_analog_data);
+               qDebug() << "Unexpected analog packet";
+               return; // This analog packet was not expected.
+       }
 
+       if (!_cur_analog_snapshot)
+       {
                // Create a new data snapshot
                _cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
                        new data::AnalogSnapshot(analog));