Prefer testing the session instead of using a global variable

[ardour.git] / gtk2_ardour / video_timeline.h

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index 55dd29a89720f4341553bfa3b6d3d0d7121de8a6..2e5aeb7ef7ec88da087b646cb075a89d2d9778a2 100644 (file)
--- a/gtk2_ardour/video_timeline.h
+++ b/gtk2_ardour/video_timeline.h
@@ -45,7 +45,7 @@ class PublicEditor;
  *  creates \ref VideoImageFrame as neccesary (which
  *  query the server for image-data).
  *
- *  This class contains the algorithm to position the single samples
+ *  This class contains the algorithm to position the single frames
  *  on the timeline according to current-zoom level and video-file
  *  attributes. see \ref update_video_timeline()
  *
@@ -74,6 +74,8 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        void toggle_offset_locked ();
        bool is_offset_locked () { return video_offset_lock; }
 
+       ARDOUR::sampleoffset_t get_video_start_offset() { return video_start_offset; }
+
        void open_video_monitor ();
        void close_video_monitor ();
        void control_video_monitor (int, int);
@@ -94,8 +96,8 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        void close_session ();
        void sync_session_state (); /* video-monitor does not actively report window/pos changes, query it */
        float get_apv(); /* audio samples per video frame; */
-       ARDOUR::samplecnt_t get_duration () { return video_duration;}
-       ARDOUR::sampleoffset_t get_offset () { return video_offset;}
+       ARDOUR::samplecnt_t    get_duration () { return video_duration;}
+       ARDOUR::sampleoffset_t get_offset ()   { return video_offset;}
        ARDOUR::sampleoffset_t quantify_samples_to_apv (ARDOUR::sampleoffset_t offset) { return rint(offset/get_apv())*get_apv(); }
        void set_offset (ARDOUR::sampleoffset_t offset) { video_offset = quantify_samples_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
 
@@ -129,11 +131,12 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        std::string xjadeo_version;
        std::string harvid_version;
 
-       typedef std::list<VideoImageFrame*> VideoSamples;
-       VideoSamples video_frames;
-       VideoImageFrame *get_video_frame (samplepos_t vfn, int cut=0, int rightend = -1);
-       bool        flush_samples;
-       void        remove_samples ();
+       typedef std::list<VideoImageFrame*> VideoFrames;
+       VideoFrames video_frames;
+       VideoImageFrame* get_video_frame (samplepos_t vfn, int cut=0, int rightend = -1);
+
+       void remove_frames ();
+       bool _flush_frames;
 
        std::string translated_filename ();