X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=5fbe518c46196318564087c45c7032069f7b75a1;hb=47c34c6c7c82396b62e101283cb25b8726dbaefd;hp=718c3dd86ce3e3f99dcae9d67f44af6afcf6d6af;hpb=775ae0e37bbec115d742feade0adc614a9a2301c;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 718c3dd86..5fbe518c4 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -78,7 +79,7 @@ VideoPanel::VideoPanel (ContentPanel* p) int r = 0; - _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP")); + _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF")); grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -86,9 +87,10 @@ VideoPanel::VideoPanel (ContentPanel* p) _frame_type = new ContentChoice ( this, new wxChoice (this, wxID_ANY), - VideoContentProperty::VIDEO_FRAME_TYPE, - boost::mem_fn (&VideoContent::video_frame_type), - boost::mem_fn (&VideoContent::set_video_frame_type), + VideoContentProperty::FRAME_TYPE, + &Content::video, + boost::mem_fn (&VideoContent::frame_type), + boost::mem_fn (&VideoContent::set_frame_type), &caster, &caster ); @@ -104,7 +106,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::left_crop), boost::mem_fn (&VideoContent::set_left_crop) ); @@ -114,7 +117,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::right_crop), boost::mem_fn (&VideoContent::set_right_crop) ); @@ -126,7 +130,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::top_crop), boost::mem_fn (&VideoContent::set_top_crop) ); @@ -136,7 +141,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), - VideoContentProperty::VIDEO_CROP, + VideoContentProperty::CROP, + &Content::video, boost::mem_fn (&VideoContent::bottom_crop), boost::mem_fn (&VideoContent::set_bottom_crop) ); @@ -159,7 +165,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _scale = new ContentChoice ( this, new wxChoice (this, wxID_ANY), - VideoContentProperty::VIDEO_SCALE, + VideoContentProperty::SCALE, + &Content::video, boost::mem_fn (&VideoContent::scale), boost::mem_fn (&VideoContent::set_scale), &index_to_scale, @@ -177,7 +184,7 @@ VideoPanel::VideoPanel (ContentPanel* p) wxSizer* s = new wxBoxSizer (wxHORIZONTAL); _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size); - s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); _filters_button = new wxButton (this, wxID_ANY, _("Edit...")); s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL); @@ -197,7 +204,7 @@ VideoPanel::VideoPanel (ContentPanel* p) /// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix _colour_conversion->Append (S_("Colour|Custom")); - s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); + s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit...")); s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); @@ -225,6 +232,7 @@ VideoPanel::VideoPanel (ContentPanel* p) } _frame_type->wrapped()->Append (_("2D")); + _frame_type->wrapped()->Append (_("3D")); _frame_type->wrapped()->Append (_("3D left/right")); _frame_type->wrapped()->Append (_("3D top/bottom")); _frame_type->wrapped()->Append (_("3D alternate")); @@ -234,23 +242,28 @@ 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)); - _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::reference_clicked, this)); - _filters_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_filters_clicked, this)); - _colour_conversion->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&VideoPanel::colour_conversion_changed, this)); - _edit_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); + _reference->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this)); + _filters_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_filters_clicked, this)); + _colour_conversion->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::colour_conversion_changed, this)); + _edit_colour_conversion_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); } void VideoPanel::film_changed (Film::Property property) { switch (property) { - case Film::CONTAINER: case Film::VIDEO_FRAME_RATE: + case Film::CONTAINER: + setup_description (); + setup_sensitivity (); + break; case Film::RESOLUTION: setup_description (); break; case Film::REEL_TYPE: + case Film::INTEROP: setup_sensitivity (); + break; default: break; } @@ -267,13 +280,10 @@ VideoPanel::film_content_changed (int property) fcs = dynamic_pointer_cast (vcs); } - if (property == VideoContentProperty::VIDEO_FRAME_TYPE) { - setup_description (); - } else if (property == VideoContentProperty::VIDEO_CROP) { - setup_description (); - } else if (property == VideoContentProperty::VIDEO_SCALE) { - setup_description (); - } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) { + if (property == ContentProperty::VIDEO_FRAME_RATE || + property == VideoContentProperty::FRAME_TYPE || + property == VideoContentProperty::CROP || + property == VideoContentProperty::SCALE) { setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { if (vcs && vcs->video->colour_conversion ()) { @@ -302,7 +312,7 @@ VideoPanel::film_content_changed (int property) checked_set (_filters, p); } } - } else if (property == VideoContentProperty::VIDEO_FADE_IN) { + } else if (property == VideoContentProperty::FADE_IN) { set check; BOOST_FOREACH (shared_ptr i, vc) { check.insert (i->video->fade_in ()); @@ -310,13 +320,13 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_in->set ( - ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->video->video_frame_rate ()), - vc.front()->video->video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_in (), vc.front()->active_video_frame_rate ()), + vc.front()->active_video_frame_rate () ); } else { _fade_in->clear (); } - } else if (property == VideoContentProperty::VIDEO_FADE_OUT) { + } else if (property == VideoContentProperty::FADE_OUT) { set check; BOOST_FOREACH (shared_ptr i, vc) { check.insert (i->video->fade_out ()); @@ -324,8 +334,8 @@ VideoPanel::film_content_changed (int property) if (check.size() == 1) { _fade_out->set ( - ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->video->video_frame_rate ()), - vc.front()->video->video_frame_rate () + ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()), + vc.front()->active_video_frame_rate () ); } else { _fade_out->clear (); @@ -409,9 +419,13 @@ 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)); - d->ShowModal (); - vc.front()->video->set_colour_conversion (d->get ()); + d->set (vc.front()->video->colour_conversion().get_value_or (PresetColourConversion::all().front().conversion)); + if (d->ShowModal() == wxID_OK) { + vc.front()->video->set_colour_conversion (d->get ()); + } else { + /* Reset the colour conversion choice */ + film_content_changed (VideoContentProperty::COLOUR_CONVERSION); + } d->Destroy (); } @@ -427,11 +441,11 @@ VideoPanel::content_selection_changed () _bottom_crop->set_content (video_sel); _scale->set_content (video_sel); - film_content_changed (VideoContentProperty::VIDEO_CROP); - film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE); + film_content_changed (ContentProperty::VIDEO_FRAME_RATE); + film_content_changed (VideoContentProperty::CROP); film_content_changed (VideoContentProperty::COLOUR_CONVERSION); - film_content_changed (VideoContentProperty::VIDEO_FADE_IN); - film_content_changed (VideoContentProperty::VIDEO_FADE_OUT); + film_content_changed (VideoContentProperty::FADE_IN); + film_content_changed (VideoContentProperty::FADE_OUT); film_content_changed (FFmpegContentProperty::FILTERS); film_content_changed (DCPContentProperty::REFERENCE_VIDEO); @@ -448,7 +462,7 @@ VideoPanel::setup_sensitivity () dcp = dynamic_pointer_cast (sel.front ()); } - list why_not; + string why_not; bool const can_reference = dcp && dcp->can_reference_video (why_not); setup_refer_button (_reference, dcp, can_reference, why_not); @@ -491,7 +505,7 @@ VideoPanel::setup_sensitivity () } if (vcs && vcs->video->colour_conversion ()) { - _edit_colour_conversion_button->Enable (!vcs->colour_conversion().get().preset()); + _edit_colour_conversion_button->Enable (!vcs->video->colour_conversion().get().preset()); } else { _edit_colour_conversion_button->Enable (false); } @@ -500,18 +514,18 @@ VideoPanel::setup_sensitivity () void VideoPanel::fade_in_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { + BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { int const vfr = _parent->film()->video_frame_rate (); - i->set_fade_in (_fade_in->get (vfr).frames_round (vfr)); + i->video->set_fade_in (_fade_in->get (vfr).frames_round (vfr)); } } void VideoPanel::fade_out_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { + BOOST_FOREACH (shared_ptr i, _parent->selected_video ()) { int const vfr = _parent->film()->video_frame_rate (); - i->set_fade_out (_fade_out->get (vfr).frames_round (vfr)); + i->video->set_fade_out (_fade_out->get (vfr).frames_round (vfr)); } }