diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-31 16:01:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-31 16:01:58 +0100 |
| commit | dd0dc62c0f3eeafab93ece448f33a18d811bcfcf (patch) | |
| tree | cc3f74c9b40f786e82dffb71ec9cbb1a08087fd0 | |
| parent | a2b83bf1b8fdf9eabb43beaec71b2fd9c34a8418 (diff) | |
Set fade in/out using content frame rate rather than DCP rate (#1642).
| -rw-r--r-- | src/wx/video_panel.cc | 4 |
1 files 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<Content> 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<Content> 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)); } } |