From 61798477a11c99ba22b4dd733cb0678403e738af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Jun 2020 22:41:51 +0200 Subject: Remove unused methods: this should happen regardless. --- src/lib/player.cc | 24 +++--------------------- src/lib/player.h | 2 -- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/src/lib/player.cc b/src/lib/player.cc index 3d6b26156..5e04271e2 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -386,13 +386,10 @@ Player::black_player_video_frame (Eyes eyes) const ); } -Frame -Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const -{ - DCPTime s = t - piece->position (); - s = min (piece->content->length_after_trim(_film), s); - s = max (DCPTime(), s + DCPTime (piece->content->trim_start(), piece->frc)); +DCPTime +Player::content_video_to_dcp (shared_ptr piece, Frame f) const +{ /* It might seem more logical here to convert s to a ContentTime (using the FrameRateChange) then convert that ContentTime to frames at the content's rate. However this fails for situations like content at 29.9978733fps, DCP at 30fps. The accuracy of the Time type is not @@ -400,25 +397,10 @@ Player::dcp_to_content_video (shared_ptr piece, DCPTime t) const Instead we convert the DCPTime using the DCP video rate then account for any skip/repeat. */ - return s.frames_floor (piece->frc.dcp) / piece->frc.factor (); -} - -DCPTime -Player::content_video_to_dcp (shared_ptr piece, Frame f) const -{ - /* See comment in dcp_to_content_video */ DCPTime const d = DCPTime::from_frames (f * piece->frc.factor(), piece->frc.dcp) - DCPTime(piece->content->trim_start(), piece->frc); return d + piece->position(); } -Frame -Player::dcp_to_resampled_audio (shared_ptr piece, DCPTime t) const -{ - DCPTime s = t - piece->position (); - s = min (piece->content->length_after_trim(_film), s); - /* See notes in dcp_to_content_video */ - return max (DCPTime (), DCPTime (piece->content->trim_start (), piece->frc) + s).frames_floor (_film->audio_frame_rate ()); -} DCPTime Player::resampled_audio_to_dcp (shared_ptr piece, Frame f) const diff --git a/src/lib/player.h b/src/lib/player.h index 6b03d4625..eb1f34f59 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -126,9 +126,7 @@ private: void film_change (ChangeType, Film::Property); void playlist_change (ChangeType); void playlist_content_change (ChangeType, int, bool); - Frame dcp_to_content_video (boost::shared_ptr piece, dcpomatic::DCPTime t) const; dcpomatic::DCPTime content_video_to_dcp (boost::shared_ptr piece, Frame f) const; - Frame dcp_to_resampled_audio (boost::shared_ptr piece, dcpomatic::DCPTime t) const; dcpomatic::DCPTime resampled_audio_to_dcp (boost::shared_ptr piece, Frame f) const; dcpomatic::ContentTime dcp_to_content_time (boost::shared_ptr piece, dcpomatic::DCPTime t) const; dcpomatic::DCPTime content_time_to_dcp (boost::shared_ptr piece, dcpomatic::ContentTime t) const; -- cgit v1.2.3