X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=211fe1b32fcf2bba13e1963bf5b67c9066cba0df;hb=6592e8fe068111b2dfae8b45699c2974681bc9d8;hp=345baea49d52b566fe8aaa920f347b8938118982;hpb=97378470ded88af84edaa0f1063d10d834475665;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index 345baea..211fe1b 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef ENABLE_FLOW #include @@ -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 format = nullptr, const map &options = map()); @@ -305,6 +307,8 @@ private: bool data_saved_; bool frame_began_; + QTime acq_time_; + #ifdef ENABLE_FLOW RefPtr pipeline_; RefPtr source_;