Fix setting of fade in/out on multiple pieces of content at the same time (#1934).

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index cfbc78c349b56bb2e2d173238f1581e7b54d10fe..ce6b08f26f408f112e2b40d150ca3ec88f09eb7d 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -311,10 +311,10 @@ VideoPanel::range_changed ()
 
        switch (_range->GetSelection()) {
        case 0:
-               vc.front()->video->set_range (VIDEO_RANGE_FULL);
+               vc.front()->video->set_range (VideoRange::FULL);
                break;
        case 1:
-               vc.front()->video->set_range (VIDEO_RANGE_VIDEO);
+               vc.front()->video->set_range (VideoRange::VIDEO);
                break;
        default:
                DCPOMATIC_ASSERT (false);
@@ -326,14 +326,14 @@ void
 VideoPanel::film_changed (Film::Property property)
 {
        switch (property) {
-       case Film::VIDEO_FRAME_RATE:
-       case Film::CONTAINER:
-       case Film::RESOLUTION:
+       case Film::Property::VIDEO_FRAME_RATE:
+       case Film::Property::CONTAINER:
+       case Film::Property::RESOLUTION:
                setup_description ();
                setup_sensitivity ();
                break;
-       case Film::REEL_TYPE:
-       case Film::INTEROP:
+       case Film::Property::REEL_TYPE:
+       case Film::Property::INTEROP:
                setup_sensitivity ();
                break;
        default:
@@ -444,7 +444,7 @@ VideoPanel::film_content_changed (int property)
                setup_sensitivity ();
        } else if (property == VideoContentProperty::RANGE) {
                if (vcs) {
-                       checked_set (_range, vcs->video->range() == VIDEO_RANGE_FULL ? 0 : 1);
+                       checked_set (_range, vcs->video->range() == VideoRange::FULL ? 0 : 1);
                } else {
                        checked_set (_range, 0);
                }
@@ -635,18 +635,20 @@ VideoPanel::setup_sensitivity ()
 void
 VideoPanel::fade_in_changed ()
 {
-       for (auto i: _parent->selected_video ()) {
+       auto const hmsf = _fade_in->get();
+       for (auto i: _parent->selected_video()) {
                double const vfr = i->active_video_frame_rate (_parent->film());
-               i->video->set_fade_in (_fade_in->get(vfr).frames_round(vfr));
+               i->video->set_fade_in (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
        }
 }
 
 void
 VideoPanel::fade_out_changed ()
 {
-       for (auto i: _parent->selected_video ()) {
+       auto const hmsf = _fade_out->get();
+       for (auto i: _parent->selected_video()) {
                double const vfr = i->active_video_frame_rate (_parent->film());
-               i->video->set_fade_out (_fade_out->get(vfr).frames_round(vfr));
+               i->video->set_fade_out (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
        }
 }