X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=a4aaf6aabbcc8c94bf32e446375e8b9218a36b26;hp=1dd48c95c5ea0e994204151fbd100c7593bd89a7;hb=HEAD;hpb=268fd2b807aef342b5a4dfec9e6d27103fb7df94

diff --git a/pv/session.hpp b/pv/session.hpp
index 1dd48c9..a4aaf6a 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -38,7 +38,7 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
-#include <QTime>
+#include <QElapsedTimer>
 
 #ifdef ENABLE_FLOW
 #include <gstreamermm.h>
@@ -172,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>());
@@ -306,7 +307,7 @@ private:
 	bool data_saved_;
 	bool frame_began_;
 
-	QTime acq_time_;
+	QElapsedTimer acq_time_;
 
 #ifdef ENABLE_FLOW
 	RefPtr<Pipeline> pipeline_;