Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / video_timeline.h

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index ef889af452d140b9fa23866dd5a81506942797ce..d82f27a3f310ee7af36d06bde81e8edeabb7dd0a 100644 (file)
--- a/gtk2_ardour/video_timeline.h
+++ b/gtk2_ardour/video_timeline.h
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #ifndef __ardour_video_timeline_h__
 #define __ardour_video_timeline_h__
 
@@ -31,7 +29,7 @@
 #include "video_image_frame.h"
 #include "video_monitor.h"
 #include "pbd/signals.h"
-#include "canvas.h"
+#include "canvas/group.h"
 
 namespace ARDOUR {
        class Session;
@@ -72,12 +70,13 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        double get_video_file_fps () { return video_file_fps; }
        void set_update_session_fps (bool v=true) { auto_set_session_fps = v; }
 
-       void set_offset_locked (bool v) { video_offset_lock = v; }
-       void toggle_offset_locked () { video_offset_lock = !video_offset_lock; }
+       void set_offset_locked (bool v);
+       void toggle_offset_locked ();
        bool is_offset_locked () { return video_offset_lock; }
 
        void open_video_monitor ();
        void close_video_monitor ();
+       void control_video_monitor (int, int);
        void terminated_video_monitor ();
        void manual_seek_video_monitor (framepos_t pos);
 
@@ -92,6 +91,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        void flush_cache ();
        void save_session ();
        void close_session ();
+       void sync_session_state (); /* video-monitor does not actively report window/pos changes, query it */
        float get_apv(); /* audio frames per video frame; */
        ARDOUR::framecnt_t get_duration () { return video_duration;}
        ARDOUR::frameoffset_t get_offset () { return video_offset;}
@@ -136,8 +136,8 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        PBD::Signal0<void> VtlUpdate;
        PBD::Signal1<void,std::string> GuiUpdate;
        void gui_update (const std::string &);
+
+       PBD::ScopedConnection sessionsave;
 };
 
 #endif /* __ardour_video_timeline_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */