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

[dcpomatic.git] / src / wx / video_panel.cc

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 6615215d5e7efe2770fc357404ac8768fe7230a3..35019d0ca49e403d3a50f86cdfd6939e44b8e6e6 100644 (file)
--- 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));
        }
 }