RouteDialog: Move built-in types into template list experiment

[ardour.git] / gtk2_ardour / video_timeline.h

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index ee682fa05edcebce9ab051392ca2db549ce9ebaf..03aaa902d8c52e56c81d1859458e38db9c7334de 100644 (file)
--- 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);
@@ -96,17 +96,18 @@ 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;
        void find_xjadeo ();
+       void find_harvid ();
 
 
        ARDOUR::frameoffset_t video_start_offset; /**< unit: audio-samples - video-file */
@@ -123,6 +124,11 @@ 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);
+       void harvid_readversion (std::string d, size_t s);
+       std::string xjadeo_version;
+       std::string harvid_version;
+
        typedef std::list<VideoImageFrame*> VideoFrames;
        VideoFrames video_frames;
        VideoImageFrame *get_video_frame (framepos_t vfn, int cut=0, int rightend = -1);