Set fade in/out using content frame rate rather than DCP rate (#1642).

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 63e9c062f330035edc67b69f330ebd69fbb47a3a..e1d9fcb123c1ffc31da68cc1fe050ad8586eeae1 100644 (file)
--- 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));
        }
 }