X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=a4aaf6aabbcc8c94bf32e446375e8b9218a36b26;hp=9566b4a06a739efd2d198fb42f4ae6cfddcf71fb;hb=HEAD;hpb=5f9a52096e07e399d76da6724c1cf56bf4511c9f

diff --git a/pv/session.hpp b/pv/session.hpp
index 9566b4a..a4aaf6a 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -38,6 +38,7 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QElapsedTimer>
 
 #ifdef ENABLE_FLOW
 #include <gstreamermm.h>
@@ -151,8 +152,12 @@ public:
 	 */
 	bool data_saved() const;
 
+	void save_setup(QSettings &settings) const;
+
 	void save_settings(QSettings &settings) const;
 
+	void restore_setup(QSettings &settings);
+
 	void restore_settings(QSettings &settings);
 
 	/**
@@ -167,9 +172,10 @@ public:
 
 	void set_default_device();
 
-	void load_init_file(const string &file_name, const string &format);
+	void load_init_file(const string &file_name, const string &format,
+		const string &setup_file_name);
 
-	void load_file(QString file_name,
+	void load_file(QString file_name, QString setup_file_name = QString(),
 		shared_ptr<sigrok::InputFormat> format = nullptr,
 		const map<string, Glib::VariantBase> &options =
 			map<string, Glib::VariantBase>());
@@ -264,6 +270,10 @@ Q_SIGNALS:
 public Q_SLOTS:
 	void on_data_saved();
 
+#ifdef ENABLE_DECODE
+	void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
+
 private:
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
@@ -297,6 +307,8 @@ private:
 	bool data_saved_;
 	bool frame_began_;
 
+	QElapsedTimer acq_time_;
+
 #ifdef ENABLE_FLOW
 	RefPtr<Pipeline> pipeline_;
 	RefPtr<Element> source_;