X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=ecc125039303f36aae1b558722e3910e5b54c8e4;hb=39e680c230c4f26f25d2688028964732647b957f;hp=8cfd86d9a9782fc340c6fdebf9103d8edba96c3c;hpb=269528f55e7fd77f762c2008d257921cd30e1519;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 8cfd86d9..ecc12503 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the PulseView project.
  *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+ * Copyright (C) 2012-14 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,8 +47,15 @@
 
 #include <QDebug>
 
-using namespace boost;
-using namespace std;
+using boost::dynamic_pointer_cast;
+using boost::function;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::map;
+using std::set;
+using std::string;
+using std::vector;
 
 namespace pv {
 
@@ -85,6 +92,9 @@ struct sr_dev_inst* SigSession::get_device() const
 
 void SigSession::set_device(struct sr_dev_inst *sdi)
 {
+	// Ensure we are not capturing before setting the device
+	stop_capture();
+
 	if (_sdi)
 		_device_manager.release_device(_sdi);
 	if (sdi)
@@ -193,15 +203,22 @@ void SigSession::stop_capture()
 	_sampling_thread.join();
 }
 
-vector< shared_ptr<view::Signal> > SigSession::get_signals() const
+set< shared_ptr<data::SignalData> > SigSession::get_data() const
 {
 	lock_guard<mutex> lock(_signals_mutex);
-	return _signals;
+	set< shared_ptr<data::SignalData> > data;
+	BOOST_FOREACH(const shared_ptr<view::Signal> sig, _signals) {
+		assert(sig);
+		data.insert(sig->data());
+	}
+
+	return data;
 }
 
-boost::shared_ptr<data::Logic> SigSession::get_data()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
 {
-	return _logic_data;
+	lock_guard<mutex> lock(_signals_mutex);
+	return _signals;
 }
 
 #ifdef ENABLE_DECODE
@@ -367,7 +384,6 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 {
 	assert(_capture_state == Stopped);
 
-	shared_ptr<view::Signal> signal;
 	unsigned int logic_probe_count = 0;
 	unsigned int analog_probe_count = 0;
 
@@ -412,34 +428,42 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 	}
 
 	// Make the Signals list
-	{
+	do {
 		lock_guard<mutex> lock(_signals_mutex);
 
 		_signals.clear();
 
-		if(sdi) {
-			for (const GSList *l = sdi->probes; l; l = l->next) {
-				sr_probe *const probe =	(sr_probe *)l->data;
-				assert(probe);
-
-				switch(probe->type) {
-				case SR_PROBE_LOGIC:
-					signal = shared_ptr<view::Signal>(
-						new view::LogicSignal(*this, probe,
-							_logic_data));
-					break;
-
-				case SR_PROBE_ANALOG:
-					signal = shared_ptr<view::Signal>(
-						new view::AnalogSignal(*this, probe,
-							_analog_data));
-					break;
-				}
-
-				_signals.push_back(signal);
+		if(!sdi)
+			break;
+
+		for (const GSList *l = sdi->probes; l; l = l->next) {
+			shared_ptr<view::Signal> signal;
+			sr_probe *const probe =	(sr_probe *)l->data;
+			assert(probe);
+
+			switch(probe->type) {
+			case SR_PROBE_LOGIC:
+				signal = shared_ptr<view::Signal>(
+					new view::LogicSignal(*this, probe,
+						_logic_data));
+				break;
+
+			case SR_PROBE_ANALOG:
+				signal = shared_ptr<view::Signal>(
+					new view::AnalogSignal(*this, probe,
+						_analog_data));
+				break;
+
+			default:
+				assert(0);
+				break;
 			}
+
+			assert(signal);
+			_signals.push_back(signal);
 		}
-	}
+
+	} while(0);
 
 	signals_changed();
 }