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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 6e23c632..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
@@ -25,8 +25,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -34,6 +34,9 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+struct srd_probe;
+
 namespace pv {
 
 class DeviceManager;
@@ -43,9 +46,12 @@ class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
 }
 
 namespace view {
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -84,18 +90,29 @@ public:
 
 	void stop_capture();
 
+	std::set< boost::shared_ptr<data::SignalData> > get_data() const;
+
 	std::vector< boost::shared_ptr<view::Signal> >
-		get_signals();
+		get_signals() const;
+
+#ifdef ENABLE_DECODE
+	bool add_decoder(srd_decoder *const dec);
+
+	std::vector< boost::shared_ptr<view::DecodeTrace> >
+		get_decode_signals() const;
 
-	boost::shared_ptr<data::Logic> get_data();
+	void remove_decode_signal(view::DecodeTrace *signal);
+#endif
 
 private:
 	void set_capture_state(capture_state state);
 
-	void update_signals();
+	void update_signals(const sr_dev_inst *const sdi);
 
 	bool is_trigger_enabled() const;
 
+	void read_sample_rate(const sr_dev_inst *const sdi);
+
 private:
 	/**
 	 * Attempts to autodetect the format. Failing that
@@ -112,7 +129,10 @@ private:
 		boost::function<void (const QString)> error_handler,
 		sr_input_format *format = NULL);
 
-	void load_thread_proc(const std::string name,
+	void load_session_thread_proc(
+		boost::function<void (const QString)> error_handler);
+
+	void load_input_thread_proc(const std::string name, sr_input *in,
 		boost::function<void (const QString)> error_handler);
 
 	void sample_thread_proc(struct sr_dev_inst *sdi,
@@ -142,6 +162,8 @@ private:
 	 */
 	struct sr_dev_inst *_sdi;
 
+	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
+
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
 
@@ -154,7 +176,7 @@ private:
 	boost::shared_ptr<data::Analog> _analog_data;
 	boost::shared_ptr<data::AnalogSnapshot> _cur_analog_snapshot;
 
-	std::auto_ptr<boost::thread> _sampling_thread;
+	boost::thread _sampling_thread;
 
 signals:
 	void capture_state_changed(int state);