Soundcloud upload example export format presets.

[ardour.git] / gtk2_ardour / video_timeline.h

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index 4bc3eb86c70fce593dcbbe18e2ab46c683ab0133..c96c9b132050f247679ce3f6ea75be4dc052254c 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__
 
@@ -88,15 +86,17 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
 
        bool found_xjadeo () { return ((_xjadeo_bin.empty())?false:true); }
        bool check_server ();
+       bool check_server_docroot ();
        void flush_local_cache ();
        void vmon_update ();
        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;}
-       ARDOUR::frameoffset_t quantify_frames_to_apv (ARDOUR::frameoffset_t offset) { return floor(offset/get_apv())*get_apv(); }
+       ARDOUR::frameoffset_t quantify_frames_to_apv (ARDOUR::frameoffset_t offset) { return rint(offset/get_apv())*get_apv(); }
        void set_offset (ARDOUR::frameoffset_t offset) { video_offset = quantify_frames_to_apv(offset); } // this function does not update video_offset_p, call save_undo() to finalize changes to this! - this fn is currently only used from editor_drag.cc
 
        protected:
@@ -142,5 +142,3 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
 };
 
 #endif /* __ardour_video_timeline_h__ */
-
-#endif /* WITH_VIDEOTIMELINE */