X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=8d85996ec6ec05e9656ffa6519e9c86ee2f1d656;hb=dca3cbee21f61422f34dc4b2b1d2cdc7eacbe2e6;hp=1dd48c95c5ea0e994204151fbd100c7593bd89a7;hpb=268fd2b807aef342b5a4dfec9e6d27103fb7df94;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index 1dd48c95..8d85996e 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>());
@@ -263,8 +264,7 @@ Q_SIGNALS:
 
 	void data_received();
 
-	void add_view(const QString &title, views::ViewType type,
-		Session *session);
+	void add_view(views::ViewType type, Session *session);
 
 public Q_SLOTS:
 	void on_data_saved();
@@ -306,7 +306,7 @@ private:
 	bool data_saved_;
 	bool frame_began_;
 
-	QTime acq_time_;
+	QElapsedTimer acq_time_;
 
 #ifdef ENABLE_FLOW
 	RefPtr<Pipeline> pipeline_;