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

diff --git a/pv/sigsession.h b/pv/sigsession.h
index fa2c7af..88c603e 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -36,6 +36,8 @@
 
 namespace pv {
 
+class DeviceManager;
+
 namespace data {
 class Analog;
 class AnalogSnapshot;
@@ -54,17 +56,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 +72,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);
 
@@ -90,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,
@@ -114,6 +140,7 @@ 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.