X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.cc;h=b68f57076e1662c3b55cdd569648f27845daa7b7;hb=c358e77e1e81a68fcb8b18cd71a31c38262b2af7;hp=2953fd8277daaa0dfefa0ffafea1bb2eaa394f74;hpb=082de27a4e4b192e541c95cb90b97be67d5ed2d0;p=ardour.git diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 2953fd8277..b68f57076e 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -17,8 +17,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef WITH_VIDEOTIMELINE - #include #include #include "ardour/tempo.h" @@ -30,8 +28,6 @@ #include "public_editor.h" #include "gui_thread.h" #include "utils.h" -#include "canvas_impl.h" -#include "simpleline.h" #include "utils_videotl.h" #include "rgb_macros.h" #include "video_timeline.h" @@ -49,7 +45,7 @@ using namespace Timecode; VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height) : editor (ed) - , videotl_bar_group(vbg) + , videotl_group(vbg) , bar_height(initial_height) { video_start_offset = 0L; @@ -273,7 +269,7 @@ float VideoTimeLine::get_apv() { // XXX: dup code - TODO use this fn in update_video_timeline() - float apv = -1; /* audio frames per video frame; */ + float apv = -1; /* audio samples per video frame; */ if (!_session) return apv; if (_session->config.get_use_video_file_fps()) { @@ -306,8 +302,8 @@ VideoTimeLine::update_video_timeline() if (_session->timecode_frames_per_second() == 0 ) return; } - double frames_per_unit = editor->unit_to_frame(1.0); - framepos_t leftmost_frame = editor->leftmost_position(); + const double samples_per_pixel = editor->get_current_zoom(); + const framepos_t leftmost_sample = editor->leftmost_sample(); /* Outline: * 1) calculate how many frames there should be in current zoom (plus 1 page on each side) @@ -319,12 +315,12 @@ VideoTimeLine::update_video_timeline() /* video-file and session properties */ double display_vframe_width; /* unit: pixels ; width of one thumbnail in the timeline */ - float apv; /* audio frames per video frame; */ + float apv; /* audio samples per video frame; */ framepos_t leftmost_video_frame; /* unit: video-frame number ; temporary var -> vtl_start */ /* variables needed to render videotimeline -- what needs to computed first */ - framepos_t vtl_start; /* unit: audio-frames ; first displayed video-frame */ - framepos_t vtl_dist; /* unit: audio-frames ; distance between displayed video-frames */ + framepos_t vtl_start; /* unit: audio-samples ; first displayed video-frame */ + framepos_t vtl_dist; /* unit: audio-samples ; distance between displayed video-frames */ unsigned int visible_video_frames; /* number of frames that fit on current canvas */ if (_session->config.get_videotimeline_pullup()) { @@ -340,12 +336,12 @@ VideoTimeLine::update_video_timeline() display_vframe_width = bar_height * video_aspect_ratio; - if (apv > frames_per_unit * display_vframe_width) { + if (apv > samples_per_pixel * display_vframe_width) { /* high-zoom: need space between successive video-frames */ vtl_dist = rint(apv); } else { /* continous timeline: skip video-frames */ - vtl_dist = ceil(display_vframe_width * frames_per_unit / apv) * apv; + vtl_dist = ceil(display_vframe_width * samples_per_pixel / apv) * apv; } assert (vtl_dist > 0); @@ -353,10 +349,10 @@ VideoTimeLine::update_video_timeline() #define GOFFSET (video_offset) - leftmost_video_frame = floor (floor((leftmost_frame - video_start_offset - GOFFSET ) / vtl_dist) * vtl_dist / apv); + leftmost_video_frame = floor (floor((leftmost_sample - video_start_offset - GOFFSET ) / vtl_dist) * vtl_dist / apv); vtl_start = rint (GOFFSET + video_start_offset + leftmost_video_frame * apv); - visible_video_frames = 2 + ceil(editor->current_page_frames() / vtl_dist); /* +2 left+right partial frames */ + visible_video_frames = 2 + ceil(editor->current_page_samples() / vtl_dist); /* +2 left+right partial frames */ /* expand timeline (cache next/prev page images) */ vtl_start -= visible_video_frames * vtl_dist; @@ -383,7 +379,7 @@ VideoTimeLine::update_video_timeline() while (video_frames.size() < visible_video_frames) { VideoImageFrame *frame; - frame = new VideoImageFrame(*editor, *videotl_bar_group, display_vframe_width, bar_height, video_server_url, translated_filename()); + frame = new VideoImageFrame(*editor, *videotl_group, display_vframe_width, bar_height, video_server_url, translated_filename()); frame->ImgChanged.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context()); video_frames.push_back(frame); } @@ -405,7 +401,7 @@ VideoTimeLine::update_video_timeline() #endif for (unsigned int vfcount=0; vfcount < visible_video_frames; ++vfcount){ - framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */ + framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */ framepos_t vframeno = rint ( (vfpos - GOFFSET) / apv); /* unit: video-frames */ vfpos = (vframeno * apv ) + GOFFSET; /* audio-frame corresponding to /rounded/ video-frame */ @@ -416,7 +412,7 @@ VideoTimeLine::update_video_timeline() } VideoImageFrame * frame = get_video_frame(vframeno, cut, rightend); if (frame) { - frame->set_position(vfpos-leftmost_frame); + frame->set_position(vfpos); outdated_video_frames.remove(frame); } else { remaining.push_back(vfcount); @@ -426,18 +422,17 @@ VideoTimeLine::update_video_timeline() for (VideoFrames::iterator i = outdated_video_frames.begin(); i != outdated_video_frames.end(); ++i ) { VideoImageFrame *frame = (*i); if (remaining.empty()) { - frame->set_position(-2 * vtl_dist); /* move off screen */ + frame->set_position(-2 * vtl_dist + leftmost_sample); /* move off screen */ } else { int vfcount=remaining.front(); remaining.pop_front(); - framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */ + framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */ framepos_t vframeno = rint ((vfpos - GOFFSET) / apv); /* unit: video-frames */ int rightend = -1; /* unit: pixels */ if (vfpos + vtl_dist > video_start_offset + video_duration + GOFFSET) { rightend = display_vframe_width * (video_start_offset + video_duration + GOFFSET - vfpos) / vtl_dist; - //printf("lf(n): %lu\n", vframeno); // XXX } - frame->set_position(vfpos-leftmost_frame); + frame->set_position(vfpos); frame->set_videoframe(vframeno, rightend); } } @@ -504,7 +499,7 @@ VideoTimeLine::video_file_info (std::string filename, bool local) _session->config.set_timecode_format(timecode_60); break; default: - warning << _("Failed to set session-framerate: ") << video_file_fps << _(" does not have a corresponding option setting in Ardour.") << endmsg; /* TODO: gettext arg */ + warning << _("Failed to set session-fps: ") << video_file_fps << _(" does not have a corresponding option setting in Ardour.") << endmsg; /* TODO: gettext arg */ break; } _session->config.set_video_pullup(0); /* TODO only set if set_timecode_format() was successful ?!*/ @@ -803,5 +798,3 @@ VideoTimeLine::manual_seek_video_monitor (framepos_t pos) if (!vmonitor->synced_by_manual_seeks()) { return; } vmonitor->manual_seek(pos, false, GOFFSET); // XXX -> set offset in xjadeo } - -#endif /* WITH_VIDEOTIMELINE */