X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=5b4144a7cbb9f026378fef3427a0de96d895c585;hp=6068b03c3058177261dbe9ff31a96d10f6405c7b;hb=02412f0b16cb5ad92654c92b472a84268e79bb54;hpb=e042ad64e28d681e0d52409ff40a9318047d9b09

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 6068b03c..5b4144a7 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
@@ -46,10 +46,12 @@ class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
 }
 
 namespace view {
-class DecodeSignal;
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -88,18 +90,20 @@ 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);
+#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::DecodeTrace *signal);
+#endif
+
 private:
 	void set_capture_state(capture_state state);
 
@@ -158,7 +162,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;