Add FilmViewer::time_until_next_frame.

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 685424b8c40a5064e8b930ad4f563551af7a2b71..e1d9fcb123c1ffc31da68cc1fe050ad8586eeae1 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -226,7 +226,7 @@ VideoPanel::add_to_grid ()
        int r = 0;
 
        _reference->Show (full);
-       _reference_note->Show (full);
+       _reference_note->Show (full && !_reference_note->GetLabel().IsEmpty());
 
        if (full) {
                wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
@@ -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));
        }
 }