Add -s / --settings parameter to load a session setup file

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index e8e2dd5ef7d245d6d21b0b60c378d6b957a6f73e..7d9375a7451f414b14975557f6c49a3705361171 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -38,6 +38,7 @@
 #include <QObject>
 #include <QSettings>
 #include <QString>
+#include <QTime>
 
 #ifdef ENABLE_FLOW
 #include <gstreamermm.h>
@@ -171,9 +172,12 @@ 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,
+               QString setup_file_name = nullptr,
                shared_ptr<sigrok::InputFormat> format = nullptr,
                const map<string, Glib::VariantBase> &options =
                        map<string, Glib::VariantBase>());
@@ -268,6 +272,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_;
@@ -301,6 +309,8 @@ private:
        bool data_saved_;
        bool frame_began_;
 
+       QTime acq_time_;
+
 #ifdef ENABLE_FLOW
        RefPtr<Pipeline> pipeline_;
        RefPtr<Element> source_;