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:03:22 +0100 |
| commit | debbe446820dcff0edfb3cc49f1e648cb4591d94 (patch) | |
| tree | d70ea1a4d300e4ff9c8c1a2d818ba290de15a986 | |
| parent | da39ed1516f2463f8a9bf4795a94f23d420c9ca3 (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 6615215d5..35019d0ca 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -555,7 +555,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)); } } @@ -564,7 +564,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)); } } |