X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=b9c09cc69672007c6d76c7117a01ad817ee8d466;hb=1d2a51bdc8315fa7283be329669860e435a1513f;hp=7a892bb742571e343e0f9cedbad5e55b063a0596;hpb=5254047c3ad8c8c4b7ed7bf5b735b8448fcf1c29;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 7a892bb74..b9c09cc69 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 @@ -51,11 +50,14 @@ using std::pair; using std::cout; using std::list; using std::set; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using boost::bind; using boost::optional; using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif VideoPanel::VideoPanel (ContentPanel* p) @@ -83,10 +85,14 @@ VideoPanel::VideoPanel (ContentPanel* p) _crop_label = create_label (this, _("Crop"), true); -#ifdef __WXGTK3__ +#if defined(__WXGTK3__) int const crop_width = 128; int const link_width = 32; int const link_height = 64; +#elif defined(DCPOMATIC_OSX) + int const crop_width = 56; + int const link_width = 19; + int const link_height = 28; #else int const crop_width = 56; int const link_width = 22; @@ -159,18 +165,18 @@ VideoPanel::VideoPanel (ContentPanel* p) _scale_label = create_label (this, _("Scale"), true); _scale_fit = new wxRadioButton (this, wxID_ANY, _("to fit DCP")); _scale_custom = new wxRadioButton (this, wxID_ANY, _("custom")); - _scale_custom_edit = new Button (this, _("Edit...")); + _scale_custom_edit = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit..."))); _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)); } /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix _colour_conversion->Append (S_("Colour|Custom")); - _edit_colour_conversion_button = new Button (this, _("Edit...")); + _edit_colour_conversion_button = new Button (this, _("Edit..."), wxDefaultPosition, small_button_size(this, _("Edit..."))); _range_label = create_label (this, _("Range"), true); _range = new wxChoice (this, wxID_ANY); @@ -214,20 +220,13 @@ VideoPanel::VideoPanel (ContentPanel* p) void VideoPanel::add_to_grid () { - bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL; - int r = 0; - _reference->Show (full); - _reference_note->Show (full && !_reference_note->GetLabel().IsEmpty()); - - if (full) { - wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); - reference_sizer->Add (_reference, 0); - reference_sizer->Add (_reference_note, 0); - _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3)); - ++r; - } + wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); + reference_sizer->Add (_reference, 0); + reference_sizer->Add (_reference_note, 0); + _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3)); + ++r; add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0)); _frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2)); @@ -235,45 +234,36 @@ VideoPanel::add_to_grid () int cr = 0; wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0)); - _left_crop->add (crop, wxGBPosition (cr, 1)); + _left_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); #ifdef __WXGTK3__ crop->Add (_left_right_link, wxGBPosition(cr, 2), wxGBSpan(2, 1)); ++cr; add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition(cr, 0)); _right_crop->add (crop, wxGBPosition(cr, 1)); #else - crop->Add (_left_right_link, wxGBPosition(cr, 2)); + crop->Add (_left_right_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 3)); - _right_crop->add (crop, wxGBPosition (cr, 4)); + _right_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); #endif ++cr; add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0)); - _top_crop->add (crop, wxGBPosition (cr, 1)); + _top_crop->add (crop, wxGBPosition (cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); #ifdef __WXGTK3__ crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxGBSpan(2, 1)); ++cr; add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition(cr, 0)); - _bottom_crop->add (crop, wxGBPosition(cr, 1)); + _bottom_crop->add (crop, wxGBPosition(cr, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); #else - crop->Add (_top_bottom_link, wxGBPosition(cr, 2)); + crop->Add (_top_bottom_link, wxGBPosition(cr, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 3)); - _bottom_crop->add (crop, wxGBPosition (cr, 4)); + _bottom_crop->add (crop, wxGBPosition (cr, 4), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); #endif add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0)); _grid->Add (crop, wxGBPosition(r, 1)); ++r; - _scale_label->Show (full); - _scale_fit->Show (full); - _scale_custom->Show (full); - _scale_custom_edit->Show (full); - _colour_conversion_label->Show (full); - _colour_conversion->Show (full); - _edit_colour_conversion_button->Show (full); - _range_label->Show (full); - _range->Show (full); - add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0)); _grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3)); ++r; @@ -282,32 +272,30 @@ VideoPanel::add_to_grid () _grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3)); ++r; - if (full) { - add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0)); - { - wxSizer* v = new wxBoxSizer (wxVERTICAL); - v->Add (_scale_fit, 0, wxBOTTOM, 4); - wxSizer* h = new wxBoxSizer (wxHORIZONTAL); - h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6); - h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL); - v->Add (h, 0); - _grid->Add (v, wxGBPosition(r, 1)); - } - ++r; - - add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0)); - { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); - s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); - _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); - } - ++r; + add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0)); + { + wxSizer* v = new wxBoxSizer (wxVERTICAL); + v->Add (_scale_fit, 0, wxBOTTOM, 4); + wxSizer* h = new wxBoxSizer (wxHORIZONTAL); + h->Add (_scale_custom, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL, 6); + h->Add (_scale_custom_edit, 0, wxALIGN_CENTER_VERTICAL); + v->Add (h, 0); + _grid->Add (v, wxGBPosition(r, 1)); + } + ++r; - add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0)); - _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL); - ++r; + add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0)); + { + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); + _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); } + ++r; + + add_label_to_sizer (_grid, _range_label, true, wxGBPosition(r, 0)); + _grid->Add (_range, wxGBPosition(r, 1), wxGBSpan(1, 2), wxALIGN_CENTER_VERTICAL); + ++r; _grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6); ++r; @@ -323,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); @@ -382,7 +370,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()); } @@ -419,7 +407,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 ()); } @@ -433,7 +421,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 ()); } @@ -456,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); } @@ -464,7 +452,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()); } @@ -514,7 +502,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)) { @@ -532,7 +520,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 { @@ -589,7 +577,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; } @@ -628,7 +616,7 @@ VideoPanel::setup_sensitivity () _scale_custom_edit->Enable (_scale_custom->GetValue()); _description->Enable (true); _colour_conversion->Enable (!video_sel.empty()); - _range->Enable (single && !video_sel.empty()); + _range->Enable (single && !video_sel.empty() && !dcp); } ContentList vc = _parent->selected_video (); @@ -647,7 +635,7 @@ VideoPanel::setup_sensitivity () void VideoPanel::fade_in_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { + 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)); } @@ -656,7 +644,7 @@ VideoPanel::fade_in_changed () void VideoPanel::fade_out_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { + 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)); } @@ -683,7 +671,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()); } } @@ -705,7 +693,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()); } @@ -733,7 +721,7 @@ void VideoPanel::left_crop_changed () { 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()); } } @@ -744,7 +732,7 @@ void VideoPanel::right_crop_changed () { 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()); } } @@ -755,7 +743,7 @@ void VideoPanel::top_crop_changed () { 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()); } } @@ -766,7 +754,7 @@ void VideoPanel::bottom_crop_changed () { 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()); } }