X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.h;h=5a1bceb25897b0c2b4595dd1ea2ef9a60e06e54d;hb=4ecb48b055c9cc2d3eaa36ec9a1ff48291257bd9;hp=ab1a9a92d85e0b85799edc0116ec7974ee742cf1;hpb=8eef4b1904bcc611f5f4230927ca9eda2352d36b;p=ardour.git

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index ab1a9a92d8..5a1bceb258 100644
--- 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/container.h"
 
 namespace ARDOUR {
 	class Session;
@@ -57,7 +55,7 @@ class PublicEditor;
 class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, public PBD::ScopedConnectionList, public PBD::StatefulDestructible
 {
 	public:
-	VideoTimeLine (PublicEditor*, ArdourCanvas::Group*, int);
+	VideoTimeLine (PublicEditor*, ArdourCanvas::Container*, int);
 	virtual ~VideoTimeLine ();
 
 	void set_session (ARDOUR::Session *s);
@@ -72,8 +70,8 @@ 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 ();
@@ -88,31 +86,33 @@ 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 ();
-	float get_apv(); /* audio frames per video frame; */
+	void sync_session_state (); /* video-monitor does not actively report window/pos changes, query it */
+	float get_apv(); /* audio samples 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:
 
 	PublicEditor *editor;
-	ArdourCanvas::Group *videotl_bar_group;
+	ArdourCanvas::Container *videotl_group;
 	int bar_height;
 
 	std::string _xjadeo_bin;
 	void find_xjadeo ();
 
 
-	ARDOUR::frameoffset_t video_start_offset; /**< unit: audio-frames - video-file */
-	ARDOUR::frameoffset_t video_offset; /**< unit: audio-frames - session */
+	ARDOUR::frameoffset_t video_start_offset; /**< unit: audio-samples - video-file */
+	ARDOUR::frameoffset_t video_offset; /**< unit: audio-samples - session */
 	ARDOUR::frameoffset_t video_offset_p; /**< used for undo from editor_drag.cc */
-	framepos_t video_duration;     /**< unit: audio-frames */
+	framepos_t video_duration;     /**< unit: audio-samples */
 	std::string video_filename;
 	bool        local_file;
 	double      video_aspect_ratio;
@@ -123,6 +123,9 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
 	std::string video_server_url;
 	std::string server_docroot;
 
+	void xjadeo_readversion (std::string d, size_t s);
+	std::string xjadeo_version;
+
 	typedef std::list<VideoImageFrame*> VideoFrames;
 	VideoFrames video_frames;
 	VideoImageFrame *get_video_frame (framepos_t vfn, int cut=0, int rightend = -1);
@@ -137,8 +140,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 */