X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.cpp;h=82fa877065254cd05c38f82aa64c19c54063732e;hb=6866d5de8994a7afe3bac9f7706cf9b8586fbbdd;hp=719f9ded3610b948438c65a2ebda098d76555f53;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 719f9ded..82fa8770 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
@@ -53,6 +53,7 @@ using boost::lock_guard;
 using boost::mutex;
 using boost::shared_ptr;
 using std::map;
+using std::set;
 using std::string;
 using std::vector;
 
@@ -202,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