X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsigsession.h;h=75ecff683fab00f1aad317fc5cbb178da17cce76;hp=fa2c7af413db55b174ad78ffa85593f409e69975;hb=67fe5e9c02e4e9cfe94d465a0a5e5b598129e4e3;hpb=d64d159628c795e1413127aafd83ec1bc9ace91c

diff --git a/pv/sigsession.h b/pv/sigsession.h
index fa2c7af4..75ecff68 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -25,8 +25,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include <QObject>
@@ -34,8 +34,13 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+struct srd_probe;
+
 namespace pv {
 
+class DeviceManager;
+
 namespace data {
 class Analog;
 class AnalogSnapshot;
@@ -44,6 +49,7 @@ class LogicSnapshot;
 }
 
 namespace view {
+class DecodeSignal;
 class Signal;
 }
 
@@ -54,17 +60,15 @@ class SigSession : public QObject
 public:
 	enum capture_state {
 		Stopped,
+		AwaitingTrigger,
 		Running
 	};
 
 public:
-	SigSession();
+	SigSession(DeviceManager &device_manager);
 
 	~SigSession();
 
-	/**
-	 * Gets device instance that will be used in the next capture session.
-	 */
 	struct sr_dev_inst* get_device() const;
 
 	/**
@@ -72,6 +76,8 @@ public:
 	 */
 	void set_device(struct sr_dev_inst *sdi);
 
+	void release_device(struct sr_dev_inst *sdi);
+
 	void load_file(const std::string &name,
 		boost::function<void (const QString)> error_handler);
 
@@ -83,15 +89,47 @@ public:
 	void stop_capture();
 
 	std::vector< boost::shared_ptr<view::Signal> >
-		get_signals();
+		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);
+
+	std::vector< boost::shared_ptr<view::DecodeSignal> >
+		get_decode_signals() const;
+
 private:
 	void set_capture_state(capture_state state);
 
+	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:
-	void load_thread_proc(const std::string name,
+	/**
+	 * Attempts to autodetect the format. Failing that
+	 * @param filename The filename of the input file.
+	 * @return A pointer to the 'struct sr_input_format' that should be
+	 * 	used, or NULL if no input format was selected or
+	 * 	auto-detected.
+	 */
+	static sr_input_format* determine_input_file_format(
+		const std::string &filename);
+
+	static sr_input* load_input_file_format(
+		const std::string &filename,
+		boost::function<void (const QString)> error_handler,
+		sr_input_format *format = NULL);
+
+	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,
@@ -114,12 +152,15 @@ private:
 		const struct sr_datafeed_packet *packet, void *cb_data);
 
 private:
+	DeviceManager &_device_manager;
 
 	/**
 	 * The device instance that will be used in the next capture session.
 	 */
 	struct sr_dev_inst *_sdi;
 
+	std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
 
@@ -132,7 +173,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);