Fix link icons on macOS.

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

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 81f78b9c005f177122b11122ca22fe1ad58afbf3..5d67bc99cc989e3c518cc942a52f50d1a69c83a1 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -89,9 +89,13 @@ VideoPanel::VideoPanel (ContentPanel* p)
        int const crop_width = 128;
        int const link_width = 32;
        int const link_height = 64;
-#elif defined(DCPOMATIC_OSX)
+#elif defined(__WXGTK20__)
        int const crop_width = 56;
        int const link_width = 24;
+       int const link_height = 32;
+#elif defined(DCPOMATIC_OSX)
+       int const crop_width = 56;
+       int const link_width = 23;
        int const link_height = 28;
 #else
        int const crop_width = 56;
@@ -311,10 +315,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 +330,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 +448,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 +639,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));
        }
 }
 
@@ -706,20 +712,29 @@ VideoPanel::scale_custom_edit_clicked ()
 void
 VideoPanel::left_right_link_clicked ()
 {
-       right_crop_changed ();
+       if (_left_changed_last) {
+               left_crop_changed ();
+       } else {
+               right_crop_changed ();
+       }
 }
 
 
 void
 VideoPanel::top_bottom_link_clicked ()
 {
-       bottom_crop_changed ();
+       if (_top_changed_last) {
+               top_crop_changed ();
+       } else {
+               bottom_crop_changed ();
+       }
 }
 
 
 void
 VideoPanel::left_crop_changed ()
 {
+       _left_changed_last = true;
        if (_left_right_link->GetValue()) {
                for (auto i: _parent->selected_video()) {
                        i->video->set_right_crop (i->video->left_crop());
@@ -731,6 +746,7 @@ VideoPanel::left_crop_changed ()
 void
 VideoPanel::right_crop_changed ()
 {
+       _left_changed_last = false;
        if (_left_right_link->GetValue()) {
                for (auto i: _parent->selected_video()) {
                        i->video->set_left_crop (i->video->right_crop());
@@ -742,6 +758,7 @@ VideoPanel::right_crop_changed ()
 void
 VideoPanel::top_crop_changed ()
 {
+       _top_changed_last = true;
        if (_top_bottom_link->GetValue()) {
                for (auto i: _parent->selected_video()) {
                        i->video->set_bottom_crop (i->video->top_crop());
@@ -753,6 +770,7 @@ VideoPanel::top_crop_changed ()
 void
 VideoPanel::bottom_crop_changed ()
 {
+       _top_changed_last = false;
        if (_top_bottom_link->GetValue()) {
                for (auto i: _parent->selected_video()) {
                        i->video->set_top_crop (i->video->bottom_crop());