X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=88c603e20127baeb171d97b3ddbb154762c5d7cf;hb=535554a4d1855b6c15bf20746b3aafd8c53a6ca9;hp=ae33c3a8a508713acde59c650cfadaeb256e634e;hpb=dc0867ff7ec693953afb62f9512ad7dd3339a2b2;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index ae33c3a..88c603e 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -56,6 +56,7 @@ class SigSession : public QObject
 public:
 	enum capture_state {
 		Stopped,
+		AwaitingTrigger,
 		Running
 	};
 
@@ -91,8 +92,32 @@ public:
 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,