X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=e3c12b4ae5035d2b0fd73063296edfd047706068;hb=5ccfb74647db6917c054d6d67f91ed5a74e397ba;hp=ac744ddc9d540c3018632b57086236178a0ce813;hpb=87933c7b40c6035ca2aecd2bbc96428813ac9b38;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index ac744ddc9..e3c12b4ae 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,11 +85,21 @@ 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(__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; + int const link_width = 22; int const link_height = 28; #endif @@ -102,7 +114,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::bind (&VideoPanel::left_crop_changed, this) ); - _left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(22, link_height)); + _left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height)); _left_right_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG)); _right_crop_label = create_label (this, _("Right"), true); @@ -127,7 +139,7 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::bind (&VideoPanel::top_crop_changed, this) ); - _top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(22, link_height)); + _top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height)); _top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link"), wxBITMAP_TYPE_PNG)); _bottom_crop_label = create_label (this, _("Bottom"), true); @@ -157,22 +169,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..."))); - _filters_label = create_label (this, _("Filters"), true); - _filters = new StaticText (this, _("None"), wxDefaultPosition, size); - _filters_button = new Button (this, _("Edit...")); - - _colour_conversion_label = create_label (this, _("Colour conversion"), true); + _colour_conversion_label = create_label (this, _("Colour"), 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); @@ -201,7 +209,6 @@ VideoPanel::VideoPanel (ContentPanel* p) _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this)); _reference->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this)); - _filters_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_filters_clicked, this)); _scale_fit->Bind (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_fit_clicked, this)); _scale_custom->Bind (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_custom_clicked, this)); _scale_custom_edit->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::scale_custom_edit_clicked, this)); @@ -217,20 +224,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)); @@ -238,48 +238,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); - _filters_label->Show (full); - _filters->Show (full); - _filters_button->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; @@ -288,41 +276,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, _filters_label, true, wxGBPosition (r, 0)); - { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); - s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL); - _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, 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, _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; @@ -338,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); @@ -353,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: @@ -397,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()); } @@ -430,23 +407,11 @@ VideoPanel::film_content_changed (int property) setup_sensitivity (); - } else if (property == FFmpegContentProperty::FILTERS) { - if (fcs) { - string p = Filter::ffmpeg_string (fcs->filters ()); - if (p.empty ()) { - checked_set (_filters, _("None")); - } else { - if (p.length() > 25) { - p = p.substr (0, 25) + "..."; - } - checked_set (_filters, p); - } - } } else if (property == VideoContentProperty::USE) { 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 ()); } @@ -460,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 ()); } @@ -483,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); } @@ -491,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()); } @@ -506,20 +471,6 @@ VideoPanel::film_content_changed (int property) } } -/** Called when the `Edit filters' button has been clicked */ -void -VideoPanel::edit_filters_clicked () -{ - FFmpegContentList c = _parent->selected_ffmpeg (); - if (c.size() != 1) { - return; - } - - FilterDialog* d = new FilterDialog (this, c.front()->filters()); - d->ActiveChanged.connect (bind (&FFmpegContent::set_filters, c.front(), _1)); - d->ShowModal (); - d->Destroy (); -} void VideoPanel::setup_description () @@ -555,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)) { @@ -573,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 { @@ -630,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; } @@ -650,8 +601,6 @@ VideoPanel::setup_sensitivity () _scale_custom->Enable (false); _scale_custom_edit->Enable (false); _description->Enable (false); - _filters->Enable (false); - _filters_button->Enable (false); _colour_conversion->Enable (false); _range->Enable (false); } else { @@ -670,10 +619,8 @@ VideoPanel::setup_sensitivity () _scale_custom->Enable (true); _scale_custom_edit->Enable (_scale_custom->GetValue()); _description->Enable (true); - _filters->Enable (true); - _filters_button->Enable (single && !ffmpeg_sel.empty ()); _colour_conversion->Enable (!video_sel.empty()); - _range->Enable (single && !video_sel.empty()); + _range->Enable (single && !video_sel.empty() && !dcp); } ContentList vc = _parent->selected_video (); @@ -692,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)); } } @@ -728,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()); } } @@ -750,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()); } @@ -763,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()); } } @@ -788,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()); } } @@ -799,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()); } } @@ -810,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()); } }