X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=6e23c63240b21489e4031d5b1f3066a72d5603e3;hb=0cf9fb2478628f5b4c5773edd1d6ad1a895ccaec;hp=d5ec200a6498a9233e47be0fc4ac1d65389b2657;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index d5ec200a..6e23c632 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -21,6 +21,7 @@
 #ifndef PULSEVIEW_PV_SIGSESSION_H
 #define PULSEVIEW_PV_SIGSESSION_H
 
+#include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 
@@ -29,13 +30,14 @@
 #include <vector>
 
 #include <QObject>
+#include <QString>
 
-extern "C" {
 #include <libsigrok/libsigrok.h>
-}
 
 namespace pv {
 
+class DeviceManager;
+
 namespace data {
 class Analog;
 class AnalogSnapshot;
@@ -54,20 +56,31 @@ class SigSession : public QObject
 public:
 	enum capture_state {
 		Stopped,
+		AwaitingTrigger,
 		Running
 	};
 
 public:
-	SigSession();
+	SigSession(DeviceManager &device_manager);
 
 	~SigSession();
 
-	void load_file(const std::string &name);
+	struct sr_dev_inst* get_device() const;
+
+	/**
+	 * Sets device instance that will be used in the next capture session.
+	 */
+	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);
 
 	capture_state get_capture_state() const;
 
-	void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
-		uint64_t sample_rate);
+	void start_capture(uint64_t record_length,
+		boost::function<void (const QString)> error_handler);
 
 	void stop_capture();
 
@@ -79,17 +92,37 @@ public:
 private:
 	void set_capture_state(capture_state state);
 
+	void update_signals();
+
+	bool is_trigger_enabled() const;
+
 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_thread_proc(const std::string name,
+		boost::function<void (const QString)> error_handler);
 
 	void sample_thread_proc(struct sr_dev_inst *sdi,
-		uint64_t record_length);
+		uint64_t record_length,
+		boost::function<void (const QString)> error_handler);
 
-	void feed_in_meta_logic(const struct sr_dev_inst *sdi,
-		const sr_datafeed_meta_logic &meta_logic);
+	void feed_in_header(const sr_dev_inst *sdi);
 
-	void feed_in_meta_analog(const struct sr_dev_inst *sdi,
-		const sr_datafeed_meta_analog &meta_analog);
+	void feed_in_meta(const sr_dev_inst *sdi,
+		const sr_datafeed_meta &meta);
 
 	void feed_in_logic(const sr_datafeed_logic &logic);
 
@@ -99,12 +132,18 @@ private:
 		const struct sr_datafeed_packet *packet);
 
 	static void data_feed_in_proc(const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet);
+		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;
+
 	mutable boost::mutex _sampling_mutex;
 	capture_state _capture_state;
-	uint64_t _sample_rate;
 
 	mutable boost::mutex _signals_mutex;
 	std::vector< boost::shared_ptr<view::Signal> > _signals;