From dd0dc62c0f3eeafab93ece448f33a18d811bcfcf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 31 Oct 2019 16:01:58 +0100 Subject: [PATCH] Set fade in/out using content frame rate rather than DCP rate (#1642). --- src/wx/video_panel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 63e9c062f..e1d9fcb12 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -624,7 +624,7 @@ void VideoPanel::fade_in_changed () { BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { - int const vfr = _parent->film()->video_frame_rate (); + int const vfr = i->active_video_frame_rate (_parent->film()); i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr)); } } @@ -633,7 +633,7 @@ void VideoPanel::fade_out_changed () { BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { - int const vfr = _parent->film()->video_frame_rate (); + int const vfr = i->active_video_frame_rate (_parent->film()); i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr)); } } -- 2.30.2