X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=7a892bb742571e343e0f9cedbad5e55b063a0596;hb=a0545f58b3e90d3c09fa376900eafd6f8fb531cb;hp=992ddf115b80455e063fe5674952b3f3bcaa73e4;hpb=c403e757cf0b029954fe18dc969314bfb179412f;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 992ddf115..7a892bb74 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -26,6 +26,7 @@ #include "content_panel.h" #include "static_text.h" #include "check_box.h" +#include "custom_scale_dialog.h" #include "dcpomatic_button.h" #include "lib/filter.h" #include "lib/ffmpeg_content.h" @@ -37,6 +38,7 @@ #include "lib/dcp_content.h" #include "lib/video_content.h" #include +#include #include #include #include @@ -55,27 +57,6 @@ using boost::bind; using boost::optional; using namespace dcpomatic; -static VideoContentScale -index_to_scale (int n) -{ - vector scales = VideoContentScale::all (); - DCPOMATIC_ASSERT (n >= 0); - DCPOMATIC_ASSERT (n < int (scales.size ())); - return scales[n]; -} - -static int -scale_to_index (VideoContentScale scale) -{ - vector scales = VideoContentScale::all (); - for (size_t i = 0; i < scales.size(); ++i) { - if (scales[i] == scale) { - return i; - } - } - - DCPOMATIC_ASSERT (false); -} VideoPanel::VideoPanel (ContentPanel* p) : ContentSubPanel (p, _("Video")) @@ -88,8 +69,6 @@ VideoPanel::VideoPanel (ContentPanel* p) font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); - _use = new wxCheckBox (this, wxID_ANY, _("Use")); - _type_label = create_label (this, _("Type"), true); _frame_type = new ContentChoice ( this, @@ -102,44 +81,66 @@ VideoPanel::VideoPanel (ContentPanel* p) &caster ); - _left_crop_label = create_label (this, _("Left crop"), true); + _crop_label = create_label (this, _("Crop"), true); + +#ifdef __WXGTK3__ + int const crop_width = 128; + int const link_width = 32; + int const link_height = 64; +#else + int const crop_width = 56; + int const link_width = 22; + int const link_height = 28; +#endif + + _left_crop_label = create_label (this, _("Left"), true); _left_crop = new ContentSpinCtrl ( this, - new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), + new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)), VideoContentProperty::CROP, &Content::video, boost::mem_fn (&VideoContent::left_crop), - boost::mem_fn (&VideoContent::set_left_crop) + boost::mem_fn (&VideoContent::set_left_crop), + boost::bind (&VideoPanel::left_crop_changed, this) ); - _right_crop_label = create_label (this, _("Right crop"), true); + _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); _right_crop = new ContentSpinCtrl ( this, - new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), + new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)), VideoContentProperty::CROP, &Content::video, boost::mem_fn (&VideoContent::right_crop), - boost::mem_fn (&VideoContent::set_right_crop) + boost::mem_fn (&VideoContent::set_right_crop), + boost::bind (&VideoPanel::right_crop_changed, this) ); - _top_crop_label = create_label (this, _("Top crop"), true); + _top_crop_label = create_label (this, _("Top"), true); _top_crop = new ContentSpinCtrl ( this, - new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), + new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)), VideoContentProperty::CROP, &Content::video, boost::mem_fn (&VideoContent::top_crop), - boost::mem_fn (&VideoContent::set_top_crop) + boost::mem_fn (&VideoContent::set_top_crop), + boost::bind (&VideoPanel::top_crop_changed, this) ); - _bottom_crop_label = create_label (this, _("Bottom crop"), true); + _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); _bottom_crop = new ContentSpinCtrl ( this, - new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), + new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(crop_width, -1)), VideoContentProperty::CROP, &Content::video, boost::mem_fn (&VideoContent::bottom_crop), - boost::mem_fn (&VideoContent::set_bottom_crop) + boost::mem_fn (&VideoContent::set_bottom_crop), + boost::bind (&VideoPanel::bottom_crop_changed, this) ); _fade_in_label = create_label (this, _("Fade in"), true); @@ -148,25 +149,17 @@ VideoPanel::VideoPanel (ContentPanel* p) _fade_out_label = create_label (this, _("Fade out"), true); _fade_out = new Timecode (this); - _scale_to_label = create_label (this, _("Scale to"), true); - _scale = new ContentChoice ( - this, - new wxChoice (this, wxID_ANY), - VideoContentProperty::SCALE, - &Content::video, - boost::mem_fn (&VideoContent::scale), - boost::mem_fn (&VideoContent::set_scale), - &index_to_scale, - &scale_to_index - ); - wxClientDC dc (this); wxSize size = dc.GetTextExtent (wxT ("A quite long name")); +#ifdef __WXGTK3__ + size.SetWidth (size.GetWidth() + 64); +#endif size.SetHeight (-1); - _filters_label = create_label (this, _("Filters"), true); - _filters = new StaticText (this, _("None"), wxDefaultPosition, size); - _filters_button = new Button (this, _("Edit...")); + _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...")); _colour_conversion_label = create_label (this, _("Colour conversion"), true); _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size); @@ -192,11 +185,6 @@ VideoPanel::VideoPanel (ContentPanel* p) _right_crop->wrapped()->SetRange (0, 4096); _bottom_crop->wrapped()->SetRange (0, 4096); - _scale->wrapped()->Clear (); - BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) { - _scale->wrapped()->Append (std_to_wx (i.name ())); - } - _frame_type->wrapped()->Append (_("2D")); _frame_type->wrapped()->Append (_("3D")); _frame_type->wrapped()->Append (_("3D left/right")); @@ -210,12 +198,15 @@ VideoPanel::VideoPanel (ContentPanel* p) _fade_in->Changed.connect (boost::bind (&VideoPanel::fade_in_changed, this)); _fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this)); - _use->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::use_clicked, 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)); _colour_conversion->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::colour_conversion_changed, this)); _range->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::range_changed, this)); _edit_colour_conversion_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); + _left_right_link->Bind (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::left_right_link_clicked, this)); + _top_bottom_link->Bind (wxEVT_TOGGLEBUTTON, boost::bind(&VideoPanel::top_bottom_link_clicked, this)); add_to_grid (); } @@ -238,10 +229,6 @@ VideoPanel::add_to_grid () ++r; } - _use->Show (full); - _grid->Add (_use, wxGBPosition(r, 0), wxGBSpan(1, 2)); - ++r; - add_label_to_sizer (_grid, _type_label, true, wxGBPosition(r, 0)); _frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2)); ++r; @@ -250,21 +237,37 @@ VideoPanel::add_to_grid () 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)); - add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 2)); - _right_crop->add (crop, wxGBPosition (cr, 3)); +#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)); + add_label_to_sizer (crop, _right_crop_label, true, wxGBPosition (cr, 3)); + _right_crop->add (crop, wxGBPosition (cr, 4)); +#endif ++cr; add_label_to_sizer (crop, _top_crop_label, true, wxGBPosition (cr, 0)); _top_crop->add (crop, wxGBPosition (cr, 1)); - add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2)); - _bottom_crop->add (crop, wxGBPosition (cr, 3)); - _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4)); - r += 2; - - _scale_to_label->Show (full); - _scale->show (full); - _filters_label->Show (full); - _filters->Show (full); - _filters_button->Show (full); +#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)); +#else + crop->Add (_top_bottom_link, wxGBPosition(cr, 2)); + add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 3)); + _bottom_crop->add (crop, wxGBPosition (cr, 4)); +#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); @@ -280,16 +283,15 @@ VideoPanel::add_to_grid () ++r; if (full) { - add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0)); - _scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); - ++r; - - add_label_to_sizer (_grid, _filters_label, true, wxGBPosition (r, 0)); + add_label_to_sizer (_grid, _scale_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); + 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; @@ -413,30 +415,7 @@ 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) { - set check; - BOOST_FOREACH (shared_ptr i, vc) { - check.insert (i->video->use()); - } - - if (check.size() == 1) { - checked_set (_use, vc.front()->video->use()); - } else { - checked_set (_use, false); - } - setup_sensitivity (); } else if (property == VideoContentProperty::FADE_IN) { set check; @@ -483,24 +462,24 @@ 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) { + check.insert (i->video->custom_ratio() || i->video->custom_size()); + } -/** Called when the `Edit filters' button has been clicked */ -void -VideoPanel::edit_filters_clicked () -{ - FFmpegContentList c = _parent->selected_ffmpeg (); - if (c.size() != 1) { - return; + if (check.size() == 1) { + checked_set (_scale_fit, !vc.front()->video->custom_ratio() && !vc.front()->video->custom_size()); + checked_set (_scale_custom, vc.front()->video->custom_ratio() || vc.front()->video->custom_size()); + } else { + checked_set (_scale_fit, true); + checked_set (_scale_custom, false); + } + setup_sensitivity (); } - - 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 () { @@ -573,7 +552,6 @@ VideoPanel::content_selection_changed () _right_crop->set_content (video_sel); _top_crop->set_content (video_sel); _bottom_crop->set_content (video_sel); - _scale->set_content (video_sel); film_content_changed (ContentProperty::VIDEO_FRAME_RATE); film_content_changed (VideoContentProperty::CROP); @@ -582,6 +560,8 @@ VideoPanel::content_selection_changed () film_content_changed (VideoContentProperty::FADE_OUT); film_content_changed (VideoContentProperty::RANGE); film_content_changed (VideoContentProperty::USE); + film_content_changed (VideoContentProperty::CUSTOM_RATIO); + film_content_changed (VideoContentProperty::CUSTOM_SIZE); film_content_changed (FFmpegContentProperty::FILTERS); film_content_changed (DCPContentProperty::REFERENCE_VIDEO); @@ -608,9 +588,14 @@ VideoPanel::setup_sensitivity () } setup_refer_button (_reference, _reference_note, dcp, can_reference, cannot); - bool const enable = !_reference->GetValue() && _use->GetValue(); + bool any_use = false; + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + if (i->video && i->video->use()) { + any_use = true; + } + } - _use->Enable (!_reference->GetValue()); + bool const enable = !_reference->GetValue() && any_use; if (!enable) { _frame_type->wrapped()->Enable (false); @@ -620,10 +605,10 @@ VideoPanel::setup_sensitivity () _bottom_crop->wrapped()->Enable (false); _fade_in->Enable (false); _fade_out->Enable (false); - _scale->wrapped()->Enable (false); + _scale_fit->Enable (false); + _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 { @@ -638,10 +623,10 @@ VideoPanel::setup_sensitivity () _bottom_crop->wrapped()->Enable (true); _fade_in->Enable (!video_sel.empty ()); _fade_out->Enable (!video_sel.empty ()); - _scale->wrapped()->Enable (true); + _scale_fit->Enable (true); + _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()); } @@ -677,13 +662,6 @@ VideoPanel::fade_out_changed () } } -void -VideoPanel::use_clicked () -{ - BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { - i->video->set_use (_use->GetValue()); - } -} void VideoPanel::reference_clicked () @@ -700,3 +678,99 @@ VideoPanel::reference_clicked () d->set_reference_video (_reference->GetValue ()); } + + +void +VideoPanel::scale_fit_clicked () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + i->video->set_custom_ratio (optional()); + } +} + + +void +VideoPanel::scale_custom_clicked () +{ + if (!scale_custom_edit_clicked()) { + _scale_fit->SetValue (true); + } +} + + +bool +VideoPanel::scale_custom_edit_clicked () +{ + shared_ptr vc = _parent->selected_video().front()->video; + 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()) { + i->video->set_custom_ratio (d->custom_ratio()); + i->video->set_custom_size (d->custom_size()); + } + } + d->Destroy (); + return r == wxID_OK; +} + + +void +VideoPanel::left_right_link_clicked () +{ + right_crop_changed (); +} + + +void +VideoPanel::top_bottom_link_clicked () +{ + bottom_crop_changed (); +} + + +void +VideoPanel::left_crop_changed () +{ + if (_left_right_link->GetValue()) { + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + i->video->set_right_crop (i->video->left_crop()); + } + } +} + + +void +VideoPanel::right_crop_changed () +{ + if (_left_right_link->GetValue()) { + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + i->video->set_left_crop (i->video->right_crop()); + } + } +} + + +void +VideoPanel::top_crop_changed () +{ + if (_top_bottom_link->GetValue()) { + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + i->video->set_bottom_crop (i->video->top_crop()); + } + } +} + + +void +VideoPanel::bottom_crop_changed () +{ + if (_top_bottom_link->GetValue()) { + BOOST_FOREACH (shared_ptr i, _parent->selected_video()) { + i->video->set_top_crop (i->video->bottom_crop()); + } + } +} + + +