Call sr_session_destroy after loading the SigSession, rather than sr_session_stop

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 94867959f184fcb547b40463e84f97fccbfea5f6..782f9c791b472ab24bb848958e847ded490d63d5 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."));
@@ -148,7 +148,7 @@ void SigSession::load_thread_proc(const string name,
        set_capture_state(Running);
 
        sr_session_run();
-       sr_session_stop();
+       sr_session_destroy();
 
        set_capture_state(Stopped);
 }
@@ -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."));
@@ -387,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);
 }