X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_monitor.h;h=d2ab91b3a7b93296f2901d5d5bdd7c8a17731754;hb=b8f5306d5bf59ddb237fabcdbab91a7d1e6fd612;hp=a6edda6e83dae6fc27921bb89ba5a15971a6520d;hpb=85ceefd70a194cd68ca49f2b6e251df4bb4b808c;p=ardour.git diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h index a6edda6e83..d2ab91b3a7 100644 --- a/gtk2_ardour/video_monitor.h +++ b/gtk2_ardour/video_monitor.h @@ -26,7 +26,7 @@ #include "ardour/types.h" #include "ardour/session.h" #include "ardour/session_handle.h" -#include "system_exec.h" +#include "ardour/system_exec.h" namespace ARDOUR { class Session; @@ -61,7 +61,6 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p void set_session (ARDOUR::Session *s); void save_session (); - void clear_session_state (); void query_full_state (bool); bool set_custom_setting (const std::string, const std::string); const std::string get_custom_setting (const std::string); @@ -84,7 +83,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p protected: PublicEditor *editor; - SystemExec *process; + ARDOUR::SystemExec *process; float fps; void parse_output (std::string d, size_t s); void terminated (); @@ -100,6 +99,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p void xjadeo_sync_setup (); ARDOUR::framepos_t manually_seeked_frame; + ARDOUR::frameoffset_t video_offset; bool sync_by_manual_seek; sigc::connection clock_connection; sigc::connection state_connection;