X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fvideo_panel.cc;h=5d67bc99cc989e3c518cc942a52f50d1a69c83a1;hb=7bdffaa2ba415f43ffa49f67bf8f921e0b62f79c;hp=5fcd527b8ba6daf8efdf70d1b6b4f73c2817030a;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 5fcd527b8..5d67bc99c 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -39,7 +39,6 @@ #include "lib/video_content.h" #include #include -#include #include #include #include @@ -90,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; @@ -171,7 +174,7 @@ VideoPanel::VideoPanel (ContentPanel* p) _colour_conversion_label = create_label (this, _("Colour conversion"), true); _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size); _colour_conversion->Append (_("None")); - BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) { + for (auto const& i: PresetColourConversion::all()) { _colour_conversion->Append (std_to_wx (i.name)); } @@ -312,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); @@ -327,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: @@ -371,7 +374,7 @@ VideoPanel::film_content_changed (int property) setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { boost::unordered_set > check; - BOOST_FOREACH (shared_ptr i, vc) { + for (auto i: vc) { check.insert (i->video->colour_conversion()); } @@ -408,7 +411,7 @@ VideoPanel::film_content_changed (int property) setup_sensitivity (); } else if (property == VideoContentProperty::FADE_IN) { set check; - BOOST_FOREACH (shared_ptr i, vc) { + for (auto i: vc) { check.insert (i->video->fade_in ()); } @@ -422,7 +425,7 @@ VideoPanel::film_content_changed (int property) } } else if (property == VideoContentProperty::FADE_OUT) { set check; - BOOST_FOREACH (shared_ptr i, vc) { + for (auto i: vc) { check.insert (i->video->fade_out ()); } @@ -445,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); } @@ -453,7 +456,7 @@ VideoPanel::film_content_changed (int property) setup_sensitivity (); } else if (property == VideoContentProperty::CUSTOM_RATIO || property == VideoContentProperty::CUSTOM_SIZE) { set check; - BOOST_FOREACH (shared_ptr i, vc) { + for (auto i: vc) { check.insert (i->video->custom_ratio() || i->video->custom_size()); } @@ -503,7 +506,7 @@ VideoPanel::colour_conversion_changed () if (s == int(all.size() + 1)) { edit_colour_conversion_clicked (); } else { - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { if (s == 0) { i->video->unset_colour_conversion (); } else if (s != int(all.size() + 2)) { @@ -521,7 +524,7 @@ VideoPanel::edit_colour_conversion_clicked () ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ()); d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion)); if (d->ShowModal() == wxID_OK) { - BOOST_FOREACH (shared_ptr i, vc) { + for (auto i: vc) { i->video->set_colour_conversion (d->get ()); } } else { @@ -578,7 +581,7 @@ VideoPanel::setup_sensitivity () setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot); bool any_use = false; - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { if (i->video && i->video->use()) { any_use = true; } @@ -636,18 +639,20 @@ VideoPanel::setup_sensitivity () void VideoPanel::fade_in_changed () { - BOOST_FOREACH (shared_ptr 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 () { - BOOST_FOREACH (shared_ptr 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)); } } @@ -672,7 +677,7 @@ VideoPanel::reference_clicked () void VideoPanel::scale_fit_clicked () { - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { i->video->set_custom_ratio (optional()); } } @@ -694,7 +699,7 @@ VideoPanel::scale_custom_edit_clicked () CustomScaleDialog* d = new CustomScaleDialog (this, vc->size(), _parent->film()->frame_size(), vc->custom_ratio(), vc->custom_size()); int const r = d->ShowModal (); if (r == wxID_OK) { - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { i->video->set_custom_ratio (d->custom_ratio()); i->video->set_custom_size (d->custom_size()); } @@ -707,22 +712,31 @@ 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()) { - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { i->video->set_right_crop (i->video->left_crop()); } } @@ -732,8 +746,9 @@ VideoPanel::left_crop_changed () void VideoPanel::right_crop_changed () { + _left_changed_last = false; if (_left_right_link->GetValue()) { - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { i->video->set_left_crop (i->video->right_crop()); } } @@ -743,8 +758,9 @@ VideoPanel::right_crop_changed () void VideoPanel::top_crop_changed () { + _top_changed_last = true; if (_top_bottom_link->GetValue()) { - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { i->video->set_bottom_crop (i->video->top_crop()); } } @@ -754,8 +770,9 @@ VideoPanel::top_crop_changed () void VideoPanel::bottom_crop_changed () { + _top_changed_last = false; if (_top_bottom_link->GetValue()) { - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + for (auto i: _parent->selected_video()) { i->video->set_top_crop (i->video->bottom_crop()); } }