X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.hpp;h=f2f8c7c8e26549be7e6ba8a5e5977c3faf6b10f2;hb=48257a69ffad409c9893605d99cd6e15161dff4f;hp=0828edbbf912cb3d8e09e18db94102df872ca1e1;hpb=bf9146988d2298e1750142dccdcf597ef13d6606;p=pulseview.git diff --git a/pv/session.hpp b/pv/session.hpp index 0828edb..f2f8c7c 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -31,7 +31,7 @@ #include #ifdef _WIN32 -// Windows: Avoid namespace pollution by thread.hpp (which includes windows.h). +// Windows: Avoid boost/thread namespace pollution (which includes windows.h). #define NOGDI #define NORESOURCE #endif @@ -40,6 +40,8 @@ #include #include +#include "util.hpp" + struct srd_decoder; struct srd_channel; @@ -114,6 +116,8 @@ public: std::set< std::shared_ptr > get_data() const; + double get_samplerate() const; + const std::unordered_set< std::shared_ptr > signals() const; @@ -142,6 +146,8 @@ private: void feed_in_meta(std::shared_ptr meta); + void feed_in_trigger(); + void feed_in_frame_begin(); void feed_in_logic(std::shared_ptr logic); @@ -180,6 +186,8 @@ Q_SIGNALS: void signals_changed(); + void trigger_event(util::Timestamp location); + void frame_began(); void data_received();