diff options
author | Robin Gareus <robin@gareus.org> | 2018-01-21 11:27:26 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2018-01-21 11:27:26 +0100 |
commit | 93625b108e9dd9b6bed4eebe9fe042222e558722 (patch) | |
tree | bdcc87de361b73942980cb3d66a50576bb877422 /gtk2_ardour/video_timeline.h | |
parent | b88fd1e6ca4fec252ab6f8f2a57b61183111f8cc (diff) |
Use "frame" for video-frames, fixes video-monitor state.
revert/amend/undo 30b087ab for video-related units
Diffstat (limited to 'gtk2_ardour/video_timeline.h')
-rw-r--r-- | gtk2_ardour/video_timeline.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h index 55dd29a897..fd882adb3e 100644 --- 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() * @@ -94,8 +94,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 +129,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 (); |