X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=e9349bba0efb1eae40e3cfa4f93dd5ddd9fc5e92;hb=55d3603d6a81995e613535a18a0949b3c469ac8a;hp=6d8e09d6c231be69e4e9ec65f635b5e3c7c9fd1b;hpb=b698553cd745bf4f50f73f513798bba6209a5d13;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 6d8e09d6..e9349bba 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -95,9 +95,42 @@ 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,
-		error_handler));
+
+	if (sr_session_load(name.c_str()) == SR_OK) {
+		GSList *devlist = NULL;
+		sr_session_dev_list(&devlist);
+
+		if (!devlist || !devlist->data ||
+			sr_session_start() != SR_OK) {
+			error_handler(tr("Failed to start session."));
+			return;
+		}
+
+		sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
+		g_slist_free(devlist);
+
+		update_signals(sdi);
+		read_sample_rate(sdi);
+
+		_sampling_thread.reset(new boost::thread(
+			&SigSession::load_session_thread_proc, this,
+			error_handler));
+
+	} else {
+		sr_input *in = NULL;
+
+		if (!(in = load_input_file_format(name.c_str(),
+			error_handler)))
+			return;
+
+		update_signals(in->sdi);
+		read_sample_rate(in->sdi);
+
+		_sampling_thread.reset(new boost::thread(
+			&SigSession::load_input_thread_proc, this,
+			name, in, error_handler));
+	}
+
 }
 
 SigSession::capture_state SigSession::get_capture_state() const
@@ -338,29 +371,63 @@ bool SigSession::is_trigger_enabled() const
 	return false;
 }
 
-void SigSession::load_thread_proc(const string name,
-	function<void (const QString)> error_handler)
+void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
 {
-	sr_input *in = NULL;
+	GVariant *gvar;
+	uint64_t sample_rate = 0;
 
-	if (sr_session_load(name.c_str()) == SR_OK) {
-		if (sr_session_start() != SR_OK) {
-			error_handler(tr("Failed to start session."));
+	// Read out the sample rate
+	if(sdi->driver)
+	{
+		const int ret = sr_config_get(sdi->driver,
+			SR_CONF_SAMPLERATE, &gvar, sdi);
+		if (ret != SR_OK) {
+			qDebug("Failed to get samplerate\n");
 			return;
 		}
+
+		sample_rate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
 	}
-	else if(!(in = load_input_file_format(name.c_str(), error_handler)))
-		return;
+
+	if(_analog_data)
+		_analog_data->set_samplerate(sample_rate);
+	if(_logic_data)
+		_logic_data->set_samplerate(sample_rate);
+}
+
+void SigSession::load_session_thread_proc(
+	function<void (const QString)> error_handler)
+{
+	(void)error_handler;
+
+	sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+
+	set_capture_state(Running);
+
+	sr_session_run();
+
+	sr_session_destroy();
+	set_capture_state(Stopped);
+
+	// Confirm that SR_DF_END was received
+	assert(!_cur_logic_snapshot);
+	assert(!_cur_analog_snapshot);
+}
+
+void SigSession::load_input_thread_proc(const string name,
+	sr_input *in, function<void (const QString)> error_handler)
+{
+	(void)error_handler;
+
+	assert(in);
+	assert(in->format);
 
 	sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
 
 	set_capture_state(Running);
 
-	if(in) {
-		assert(in->format);
-		in->format->loadfile(in, name.c_str());
-	} else
-		sr_session_run();
+	in->format->loadfile(in, name.c_str());
 
 	sr_session_destroy();
 	set_capture_state(Stopped);
@@ -416,27 +483,7 @@ void SigSession::sample_thread_proc(struct sr_dev_inst *sdi,
 
 void SigSession::feed_in_header(const sr_dev_inst *sdi)
 {
-	GVariant *gvar;
-	uint64_t sample_rate = 0;
-
-	// Read out the sample rate
-	if(sdi->driver)
-	{
-		const int ret = sr_config_get(sdi->driver,
-			SR_CONF_SAMPLERATE, &gvar, sdi);
-		if (ret != SR_OK) {
-			qDebug("Failed to get samplerate\n");
-			return;
-		}
-
-		sample_rate = g_variant_get_uint64(gvar);
-		g_variant_unref(gvar);
-	}
-
-	if(_analog_data)
-		_analog_data->set_samplerate(sample_rate);
-	if(_logic_data)
-		_logic_data->set_samplerate(sample_rate);
+	read_sample_rate(sdi);
 }
 
 void SigSession::feed_in_meta(const sr_dev_inst *sdi,