globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / gtk2_ardour / video_timeline.h

diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h
index 03aaa902d8c52e56c81d1859458e38db9c7334de..55dd29a89720f4341553bfa3b6d3d0d7121de8a6 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 frames
+ *  This class contains the algorithm to position the single samples
  *  on the timeline according to current-zoom level and video-file
  *  attributes. see \ref update_video_timeline()
  *
@@ -78,7 +78,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        void close_video_monitor ();
        void control_video_monitor (int, int);
        void terminated_video_monitor ();
-       void manual_seek_video_monitor (framepos_t pos);
+       void manual_seek_video_monitor (samplepos_t pos);
 
        void parameter_changed (std::string const & p);
        void set_video_server_url (std::string);
@@ -94,10 +94,10 @@ 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::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 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
+       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
 
        protected:
 
@@ -110,10 +110,10 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        void find_harvid ();
 
 
-       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-samples */
+       ARDOUR::sampleoffset_t video_start_offset; /**< unit: audio-samples - video-file */
+       ARDOUR::sampleoffset_t video_offset; /**< unit: audio-samples - session */
+       ARDOUR::sampleoffset_t video_offset_p; /**< used for undo from editor_drag.cc */
+       samplepos_t video_duration;     /**< unit: audio-samples */
        std::string video_filename;
        bool        local_file;
        double      video_aspect_ratio;
@@ -129,11 +129,11 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
        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);
-       bool        flush_frames;
-       void        remove_frames ();
+       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 ();
 
        std::string translated_filename ();