X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=9c03b882ffc9c02cc174be25d3c2f22218a9003c;hp=8ab7dab845708a1cc1c818e549096a1807b647b3;hb=140181a46034cf65739ba4bf0bf1260ab94ac736;hpb=f2edb55712e1f295935582558f694077da8d81e6

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 8ab7dab8..9c03b882 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -29,6 +29,8 @@
 
 #include <assert.h>
 
+#include <QDebug>
+
 using namespace boost;
 using namespace std;
 
@@ -77,6 +79,21 @@ void SigSession::start_capture(struct sr_dev_inst *sdi,
 {
 	stop_capture();
 
+	// Check that at least one probe is enabled
+	const GSList *l;
+	for (l = sdi->probes; l; l = l->next) {
+		sr_probe *const probe = (sr_probe*)l->data;
+		assert(probe);
+		if (probe->enabled)
+			break;
+	}
+
+	if (!l) {
+		error_handler(tr("No probes enabled."));
+		return;
+	}
+
+	// Begin the session
 	_sampling_thread.reset(new boost::thread(
 		&SigSession::sample_thread_proc, this, sdi,
 		record_length, error_handler));
@@ -121,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."));
@@ -144,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."));
@@ -154,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();
@@ -177,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;
 
@@ -202,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
 	{
@@ -211,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);
 		}
 	}
@@ -244,7 +264,7 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
 			case SR_PROBE_ANALOG:
 				signal = shared_ptr<view::Signal>(
 					new view::AnalogSignal(probe->name,
-						_analog_data));
+						_analog_data, probe->index));
 				break;
 			}
 
@@ -277,10 +297,15 @@ void SigSession::feed_in_meta(const sr_dev_inst *sdi,
 void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 {
 	lock_guard<mutex> lock(_data_mutex);
-	if (!_cur_logic_snapshot)
+
+	if (!_logic_data)
 	{
-		assert(_logic_data);
+		qDebug() << "Unexpected logic packet";
+		return;
+	}
 
+	if (!_cur_logic_snapshot)
+	{
 		// Create a new data snapshot
 		_cur_logic_snapshot = shared_ptr<data::LogicSnapshot>(
 			new data::LogicSnapshot(logic));
@@ -298,10 +323,15 @@ void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
 void SigSession::feed_in_analog(const sr_datafeed_analog &analog)
 {
 	lock_guard<mutex> lock(_data_mutex);
-	if (!_cur_analog_snapshot)
+
+	if(!_analog_data)
 	{
-		assert(_analog_data);
+		qDebug() << "Unexpected analog packet";
+		return;	// This analog packet was not expected.
+	}
 
+	if (!_cur_analog_snapshot)
+	{
 		// Create a new data snapshot
 		_cur_analog_snapshot = shared_ptr<data::AnalogSnapshot>(
 			new data::AnalogSnapshot(analog));
@@ -357,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);
 }