X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=8d85996ec6ec05e9656ffa6519e9c86ee2f1d656;hb=8400211329afbb76fb71dfd969b1149e5a6d2ff4;hp=e8e2dd5ef7d245d6d21b0b60c378d6b957a6f73e;hpb=323715c41a09a1aba08f4b716e9d93da58f0f3a8;p=pulseview.git

diff --git a/pv/session.hpp b/pv/session.hpp
index e8e2dd5e..8d85996e 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>
@@ -171,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>());
@@ -262,12 +264,15 @@ 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();
 
+#ifdef ENABLE_DECODE
+	void on_new_decoders_selected(vector<const srd_decoder*> decoders);
+#endif
+
 private:
 	DeviceManager &device_manager_;
 	shared_ptr<devices::Device> device_;
@@ -301,6 +306,8 @@ private:
 	bool data_saved_;
 	bool frame_began_;
 
+	QElapsedTimer acq_time_;
+
 #ifdef ENABLE_FLOW
 	RefPtr<Pipeline> pipeline_;
 	RefPtr<Element> source_;