X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=4ce6131d4bd39f9a7daf09c43e3b2044aa290df9;hb=632ba77ec49a10f482d7489b1a2d64dba2c2e705;hp=ae33c3a8a508713acde59c650cfadaeb256e634e;hpb=dc0867ff7ec693953afb62f9512ad7dd3339a2b2;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index ae33c3a8..4ce6131d 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -25,6 +25,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
+#include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ -34,6 +35,9 @@
 
 #include <libsigrok/libsigrok.h>
 
+struct srd_decoder;
+struct srd_probe;
+
 namespace pv {
 
 class DeviceManager;
@@ -46,6 +50,7 @@ class LogicSnapshot;
 }
 
 namespace view {
+class DecodeSignal;
 class Signal;
 }
 
@@ -56,6 +61,7 @@ class SigSession : public QObject
 public:
 	enum capture_state {
 		Stopped,
+		AwaitingTrigger,
 		Running
 	};
 
@@ -88,11 +94,39 @@ public:
 
 	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);
+
 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,
@@ -122,6 +156,8 @@ private:
 	 */
 	struct sr_dev_inst *_sdi;
 
+	std::vector< boost::shared_ptr<view::DecodeSignal> > _decode_traces;
+
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;