X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.h;h=5a1bceb25897b0c2b4595dd1ea2ef9a60e06e54d;hb=9215710c5999678862a6535139ce14c507d754a2;hp=bea72f1f77723cd0d439383ee166ddc1f6babda7;hpb=bebe2af95ad9999fdca719450dc2c70cfb849076;p=ardour.git

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index bea72f1f77..5a1bceb258 100644
--- a/gtk2_ardour/video_timeline.h
+++ b/gtk2_ardour/video_timeline.h
@@ -29,7 +29,7 @@
 #include "video_image_frame.h"
 #include "video_monitor.h"
 #include "pbd/signals.h"
-#include "canvas/group.h"
+#include "canvas/container.h"
 
 namespace ARDOUR {
 	class Session;
@@ -55,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);
@@ -86,6 +86,7 @@ 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 ();
@@ -95,13 +96,13 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
 	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_group;
+	ArdourCanvas::Container *videotl_group;
 	int bar_height;
 
 	std::string _xjadeo_bin;
@@ -122,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);