X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=a9a7ce23dce93b5bbd70efdabc3c84a7bf1db4c3;hp=805f6ae07efda2f153a2514a24a64607b2e0f54d;hb=13a3528cfa6ed4dc18c44aae2353ac145b0160cc;hpb=e8c9f8a5a3186f9c3e4f23ba4e35de7c59410bd3

diff --git a/pv/sigsession.h b/pv/sigsession.h
index 805f6ae0..a9a7ce23 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,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
+#include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -34,18 +35,25 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+struct srd_probe;
+
 namespace pv {
 
 class DeviceManager;
+class DevInst;
 
 namespace data {
 class Analog;
 class AnalogSnapshot;
 class Logic;
 class LogicSnapshot;
+class SignalData;
 }
 
 namespace view {
+class DecodeTrace;
+class LogicSignal;
 class Signal;
 }
 
@@ -65,37 +73,50 @@ public:
 
 	~SigSession();
 
-	struct sr_dev_inst* get_device() const;
+	boost::shared_ptr<DevInst> get_device() const;
 
 	/**
 	 * Sets device instance that will be used in the next capture session.
 	 */
-	void set_device(struct sr_dev_inst *sdi);
+	void set_device(boost::shared_ptr<DevInst> dev_inst);
 
-	void release_device(struct sr_dev_inst *sdi);
+	void release_device(boost::shared_ptr<DevInst> dev_inst);
 
 	void load_file(const std::string &name,
 		boost::function<void (const QString)> error_handler);
 
 	capture_state get_capture_state() const;
 
-	void start_capture(uint64_t record_length,
-		boost::function<void (const QString)> error_handler);
+	void start_capture(boost::function<void (const QString)> error_handler);
 
 	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);
 
-	boost::shared_ptr<data::Logic> get_data();
+	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);
 
-	void update_signals(const sr_dev_inst *const sdi);
+	void update_signals(boost::shared_ptr<DevInst> dev_inst);
 
 	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:
 	/**
 	 * Attempts to autodetect the format. Failing that
@@ -118,8 +139,7 @@ private:
 	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,
-		uint64_t record_length,
+	void sample_thread_proc(boost::shared_ptr<DevInst> dev_inst,
 		boost::function<void (const QString)> error_handler);
 
 	void feed_in_header(const sr_dev_inst *sdi);
@@ -143,7 +163,9 @@ private:
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
-	struct sr_dev_inst *_sdi;
+	boost::shared_ptr<DevInst> _dev_inst;
+
+	std::vector< boost::shared_ptr<view::DecodeTrace> > _decode_traces;
 
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
@@ -154,10 +176,10 @@ 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;
 
-	std::auto_ptr<boost::thread> _sampling_thread;
+	boost::thread _sampling_thread;
 
 signals:
 	void capture_state_changed(int state);