X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.h;h=dd61d2ef73c6646c4cfa7471c87f856d683ec532;hb=41c4c41eaa09a7d831988af828dd040499130bf1;hp=d82f27a3f310ee7af36d06bde81e8edeabb7dd0a;hpb=6ae4f104371ed433a79c8845de97428d964edd8b;p=ardour.git

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index d82f27a3f3..dd61d2ef73 100644
--- a/gtk2_ardour/video_timeline.h
+++ b/gtk2_ardour/video_timeline.h
@@ -86,32 +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 ();
 	void sync_session_state (); /* video-monitor does not actively report window/pos changes, query it */
-	float get_apv(); /* audio frames per video frame; */
+	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::Group *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;