Made UNIX signals an optional feature

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 55b33087a3dbd5b2533df32001efe8836b934974..9c03b882ffc9c02cc174be25d3c2f22218a9003c 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -138,7 +138,7 @@ void SigSession::load_thread_proc(const string name,
                return;
        }
 
-       sr_session_datafeed_callback_add(data_feed_in_proc);
+       sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
 
        if (sr_session_start() != SR_OK) {
                error_handler(tr("Failed to start session."));
@@ -161,7 +161,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
        assert(error_handler);
 
        sr_session_new();
-       sr_session_datafeed_callback_add(data_feed_in_proc);
+       sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
 
        if (sr_session_dev_add(sdi) != SR_OK) {
                error_handler(tr("Failed to use device."));
@@ -171,7 +171,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 
        // Set the sample limit
        if (sr_config_set(sdi, SR_CONF_LIMIT_SAMPLES,
-               &record_length) != SR_OK) {
+               g_variant_new_uint64(record_length)) != SR_OK) {
                error_handler(tr("Failed to configure "
                        "time-based sample limit."));
                sr_session_destroy();
@@ -194,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;
 
@@ -219,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
        {
@@ -228,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);
                }
        }
@@ -384,8 +387,9 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 }
 
 void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
-       const struct sr_datafeed_packet *packet)
+       const struct sr_datafeed_packet *packet, void *cb_data)
 {
+       (void) cb_data;
        assert(_session);
        _session->data_feed_in(sdi, packet);
 }