Make data_feed_in and data_feed_in_proc packet parameter a const pointer

[pulseview.git] / pv / sigsession.cpp

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index e19291d40004d9bdaa5c7611eeaa1aa71e1f1e20..42d8e5520a379b1de3c024daa144bb6c5649892a 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -55,15 +55,11 @@ SigSession::~SigSession()
        _session = NULL;
 }
 
-void SigSession::load_file(const std::string &name)
+void SigSession::load_file(const string &name)
 {
-       if (sr_session_load(name.c_str()) == SR_OK) {
-               /* sigrok session file */
-               sr_session_datafeed_callback_add(data_feed_in_proc);
-               sr_session_start();
-               sr_session_run();
-               sr_session_stop();
-       }
+       stop_capture();
+       _sampling_thread.reset(new boost::thread(
+               &SigSession::load_thread_proc, this, name));
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -114,6 +110,28 @@ void SigSession::set_capture_state(capture_state state)
        capture_state_changed(state);
 }
 
+void SigSession::load_thread_proc(const string name)
+{
+       if (sr_session_load(name.c_str()) != SR_OK) {
+               qDebug() << "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.";
+               return;
+       }
+
+       set_capture_state(Running);
+
+       sr_session_run();
+       sr_session_stop();
+
+       set_capture_state(Stopped);
+}
+
 void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
        uint64_t record_length, uint64_t sample_rate)
 {
@@ -154,7 +172,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 }
 
 void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
-       struct sr_datafeed_packet *packet)
+       const struct sr_datafeed_packet *packet)
 {
        using view::LogicSignal;
 
@@ -245,7 +263,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 }
 
 void SigSession::data_feed_in_proc(const struct sr_dev_inst *sdi,
-       struct sr_datafeed_packet *packet)
+       const struct sr_datafeed_packet *packet)
 {
        assert(_session);
        _session->data_feed_in(sdi, packet);