X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_monitor.cc;h=c04d9bde3599cf603347745585cf93126a5f9598;hb=6ee44cf3777c5c7fe781e0196ef3a71f96b65de5;hp=6b06f917445be002fe7fc09c40cfed985f795f2d;hpb=848e75aaeaa04a81883ed30bcd04abd862f9d1fd;p=ardour.git

diff --git a/gtk2_ardour/video_monitor.cc b/gtk2_ardour/video_monitor.cc
index 6b06f91744..c04d9bde35 100644
--- a/gtk2_ardour/video_monitor.cc
+++ b/gtk2_ardour/video_monitor.cc
@@ -481,18 +481,18 @@ VideoMonitor::set_offset (ARDOUR::frameoffset_t offset)
 	if (offset == NO_OFFSET ) { return; }
 
 	framecnt_t video_frame_offset;
-	framecnt_t audio_frame_rate;
+	framecnt_t audio_sample_rate;
 	if (_session->config.get_videotimeline_pullup()) {
-		audio_frame_rate = _session->frame_rate();
+		audio_sample_rate = _session->frame_rate();
 	} else {
-		audio_frame_rate = _session->nominal_frame_rate();
+		audio_sample_rate = _session->nominal_frame_rate();
 	}
 
 	/* Note: pull-up/down are applied here: frame_rate() vs. nominal_frame_rate() */
 	if (_session->config.get_use_video_file_fps()) {
-		video_frame_offset = floor(offset * fps / audio_frame_rate);
+		video_frame_offset = floor(offset * fps / audio_sample_rate);
 	} else {
-		video_frame_offset = floor(offset * _session->timecode_frames_per_second() / audio_frame_rate);
+		video_frame_offset = floor(offset * _session->timecode_frames_per_second() / audio_sample_rate);
 	}
 
 	if (video_offset == video_frame_offset) { return; }
@@ -508,18 +508,18 @@ VideoMonitor::manual_seek (framepos_t when, bool /*force*/, ARDOUR::frameoffset_
 	if (!is_started()) { return; }
 	if (!_session) { return; }
 	framecnt_t video_frame;
-	framecnt_t audio_frame_rate;
+	framecnt_t audio_sample_rate;
 	if (_session->config.get_videotimeline_pullup()) {
-		audio_frame_rate = _session->frame_rate();
+		audio_sample_rate = _session->frame_rate();
 	} else {
-		audio_frame_rate = _session->nominal_frame_rate();
+		audio_sample_rate = _session->nominal_frame_rate();
 	}
 
 	/* Note: pull-up/down are applied here: frame_rate() vs. nominal_frame_rate() */
 	if (_session->config.get_use_video_file_fps()) {
-		video_frame = floor(when * fps / audio_frame_rate);
+		video_frame = floor(when * fps / audio_sample_rate);
 	} else {
-		video_frame = floor(when * _session->timecode_frames_per_second() / audio_frame_rate);
+		video_frame = floor(when * _session->timecode_frames_per_second() / audio_sample_rate);
 	}
 	if (video_frame < 0 ) video_frame = 0;