X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=f4d150dbe0031133afbd2497db3c4947a047c01b;hb=0466001be51e779b23aaebec1cc9361305c07be9;hp=7d9375a7451f414b14975557f6c49a3705361171;hpb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index 7d9375a7..f4d150db 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #ifdef ENABLE_FLOW #include @@ -172,12 +172,12 @@ public: void set_default_device(); - void load_init_file(const string &file_name, - const string &format, + bool using_file_device() const; + + 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, + void load_file(QString file_name, QString setup_file_name = QString(), shared_ptr format = nullptr, const map &options = map()); @@ -266,8 +266,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(); @@ -309,7 +308,7 @@ private: bool data_saved_; bool frame_began_; - QTime acq_time_; + QElapsedTimer acq_time_; #ifdef ENABLE_FLOW RefPtr pipeline_;