X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=cda49b5ca5c3ada9a3b4853c61909a6aa66d35a6;hb=124d97dee9b5e24c1025250fabd2255af68c9aa5;hp=e0eb493853cb54d871f2aafc5e8e15b21376a232;hpb=c51482b339fbb76e0de042ac3f136a6e5b752b9a;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index e0eb493..cda49b5 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -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
@@ -26,6 +26,7 @@
 #include <boost/thread.hpp>
 
 #include <map>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -46,10 +47,12 @@ class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
 }
 
 namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -88,20 +91,19 @@ public:
 
 	void stop_capture();
 
+	std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
 	std::vector< boost::shared_ptr<view::Signal> >
 		get_signals() const;
 
-	boost::shared_ptr<data::Logic> get_data();
-
-	void add_decoder(srd_decoder *const dec,
-		std::map<const srd_probe*,
-			boost::shared_ptr<view::Signal> > probes,
-		GHashTable *options);
+#ifdef ENABLE_DECODE
+	bool add_decoder(srd_decoder *const dec);
 
-	std::vector< boost::shared_ptr<view::DecodeSignal> >
+	std::vector< boost::shared_ptr<view::DecodeTrace> >
 		get_decode_signals() const;
 
-	void remove_decode_signal(view::DecodeSignal *signal);
+	void remove_decode_signal(view::DecodeTrace *signal);
+#endif
 
 private:
 	void set_capture_state(capture_state state);
@@ -110,6 +112,9 @@ private:
 
 	bool is_trigger_enabled() const;
 
+	boost::shared_ptr<view::Signal> signal_from_probe(
+		const sr_probe *probe) const;
+
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
@@ -161,7 +166,7 @@ private:
 	 */
 	struct sr_dev_inst *_sdi;
 
-	std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
 
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
@@ -172,8 +177,8 @@ private:
 	mutable boost::mutex _data_mutex;
 	boost::shared_ptr<data::Logic> _logic_data;
 	boost::shared_ptr<data::LogicSnapshot> _cur_logic_snapshot;
-	boost::shared_ptr<data::Analog> _analog_data;
-	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
+	std::map< const sr_probe*, boost::shared_ptr<data::AnalogSnapshot> >
+		_cur_analog_snapshots;
 
 	boost::thread _sampling_thread;