X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=42d8e5520a379b1de3c024daa144bb6c5649892a;hp=580b6796c680f8a76c679dfad20d7ea11640aaa4;hb=bc5c1a99be1dbbad5263ce9852f38b5c31ce1c4a;hpb=5b7cf66c34d7beeef055b06b95d72f9d7a3de680

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 580b6796..42d8e552 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -47,7 +47,7 @@ SigSession::~SigSession()
 {
 	stop_capture();
 
-	if(_sampling_thread.get())
+	if (_sampling_thread.get())
 		_sampling_thread->join();
 	_sampling_thread.reset();
 
@@ -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
@@ -85,17 +81,15 @@ void SigSession::start_capture(struct sr_dev_inst *sdi,
 
 void SigSession::stop_capture()
 {
-	if(get_capture_state() == Stopped)
+	if (get_capture_state() == Stopped)
 		return;
 
 	sr_session_stop();
 
 	// Check that sampling stopped
-	if(_sampling_thread.get())
+	if (_sampling_thread.get())
 		_sampling_thread->join();
 	_sampling_thread.reset();
-
-	_capture_state = Stopped;
 }
 
 vector< shared_ptr<view::Signal> > SigSession::get_signals()
@@ -109,6 +103,35 @@ boost::shared_ptr<LogicData> SigSession::get_data()
 	return _logic_data;
 }
 
+void SigSession::set_capture_state(capture_state state)
+{
+	lock_guard<mutex> lock(_state_mutex);
+	_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)
 {
@@ -140,17 +163,16 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 		return;
 	}
 
-	{
-		lock_guard<mutex> lock(_state_mutex);
-		_capture_state = Running;
-	}
+	set_capture_state(Running);
 
 	sr_session_run();
 	sr_session_destroy();
+
+	set_capture_state(Stopped);
 }
 
 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;
 
@@ -177,7 +199,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 		// Create an empty LogiData for coming data snapshots
 		_logic_data.reset(new LogicData(meta_logic));
 		assert(_logic_data);
-		if(!_logic_data)
+		if (!_logic_data)
 			break;
 	}
 
@@ -190,7 +212,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 			const sr_probe *const probe =
 				(const sr_probe*)g_slist_nth_data(
 					sdi->probes, i);
-			if(probe->enabled)
+			if (probe->enabled)
 			{
 				shared_ptr<LogicSignal> signal(
 					new LogicSignal(probe->name,
@@ -209,7 +231,7 @@ void SigSession::data_feed_in(const struct sr_dev_inst *sdi,
 	{
 		lock_guard<mutex> lock(_data_mutex);
 		assert(packet->payload);
-		if(!_cur_logic_snapshot)
+		if (!_cur_logic_snapshot)
 		{
 			// Create a new data snapshot
 			_cur_logic_snapshot = shared_ptr<LogicDataSnapshot>(
@@ -241,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);