Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / video_monitor.h

diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h
index 7bb74c7e05561262ff48cb65108f92eda96521ab..0f954e9cd5c3cf5de467fd7d12ff5a2bf565614e 100644 (file)
--- a/gtk2_ardour/video_monitor.h
+++ b/gtk2_ardour/video_monitor.h
@@ -62,7 +62,9 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
        void open (std::string);
 
        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);
        void restore_settings_mask (int i)  { _restore_settings_mask = i;}
@@ -71,9 +73,12 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
        void set_offset (ARDOUR::frameoffset_t);
        void manual_seek (ARDOUR::framepos_t, bool, ARDOUR::frameoffset_t);
        void srsupdate ();
+       void querystate ();
        bool synced_by_manual_seeks() { return sync_by_manual_seek; }
 
        sigc::signal<void> Terminated;
+       PBD::Signal1<void,std::string> UiState;
+       void send_cmd (int what, int param);
 
 #if 1
        void set_debug (bool onoff) { debug_enable = onoff; }
@@ -86,7 +91,6 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
        void parse_output (std::string d, size_t s);
        void terminated ();
 
-       void save_session ();
        void parameter_changed (std::string const & p);
 
        typedef std::map<std::string,std::string> XJSettings;
@@ -99,6 +103,11 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
        ARDOUR::framepos_t manually_seeked_frame;
        bool sync_by_manual_seek;
        sigc::connection clock_connection;
+       sigc::connection state_connection;
+       int state_clk_divide;
+       int starting;
+       int knownstate;
+       int osdmode;
 #if 1
        bool debug_enable;
 #endif