X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=666c65bd4569945a5a48d5a9b6d58e7bb9375213;hb=c9c205039cd9f505f3fbff73d63285557678217f;hp=63e3bbff94b56ce12f90c8f08132621c6a04c4af;hpb=5c45b2d4837055ce6c0abe651f11d26d4dc4147e;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 63e3bbff9..666c65bd4 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + 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 . */ @@ -31,6 +32,7 @@ #include "lib/ratio.h" #include "lib/frame_rate_change.h" #include "lib/dcp_content.h" +#include "lib/video_content.h" #include #include #include @@ -72,22 +74,34 @@ scale_to_index (VideoContentScale scale) VideoPanel::VideoPanel (ContentPanel* p) : ContentSubPanel (p, _("Video")) { + wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); + + _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's video as OV and make VF")); + reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP); + + _reference_note = new wxStaticText (this, wxID_ANY, _("")); + _reference_note->Wrap (200); + reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); + wxFont font = _reference_note->GetFont(); + font.SetStyle(wxFONTSTYLE_ITALIC); + font.SetPointSize(font.GetPointSize() - 1); + _reference_note->SetFont(font); + + _sizer->Add (reference_sizer); + wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _sizer->Add (grid, 0, wxALL, 8); int r = 0; - _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP")); - grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; - add_label_to_sizer (grid, this, _("Type"), true, wxGBPosition (r, 0)); _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 ); @@ -103,7 +117,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) ); @@ -113,7 +128,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) ); @@ -125,7 +141,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) ); @@ -135,7 +152,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) ); @@ -158,7 +176,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, @@ -176,7 +195,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); @@ -193,8 +212,10 @@ VideoPanel::VideoPanel (ContentPanel* p) BOOST_FOREACH (PresetColourConversion 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")); - 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); @@ -205,9 +226,6 @@ VideoPanel::VideoPanel (ContentPanel* p) _description = new wxStaticText (this, wxID_ANY, wxT ("\n \n \n \n \n"), wxDefaultPosition, wxDefaultSize); grid->Add (_description, wxGBPosition (r, 0), wxGBSpan (1, 4), wxEXPAND | wxALIGN_CENTER_VERTICAL, 6); - wxFont font = _description->GetFont(); - font.SetStyle(wxFONTSTYLE_ITALIC); - font.SetPointSize(font.GetPointSize() - 1); _description->SetFont(font); ++r; @@ -222,6 +240,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")); @@ -231,23 +250,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; } @@ -256,25 +280,22 @@ VideoPanel::film_changed (Film::Property property) void VideoPanel::film_content_changed (int property) { - VideoContentList vc = _parent->selected_video (); - shared_ptr vcs; + ContentList vc = _parent->selected_video (); + shared_ptr vcs; shared_ptr fcs; if (!vc.empty ()) { vcs = vc.front (); 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->colour_conversion ()) { - optional preset = vcs->colour_conversion().get().preset (); + if (vcs && vcs->video->colour_conversion ()) { + optional preset = vcs->video->colour_conversion().get().preset (); vector cc = PresetColourConversion::all (); if (preset) { checked_set (_colour_conversion, preset.get() + 1); @@ -299,25 +320,31 @@ 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->fade_in ()); + BOOST_FOREACH (shared_ptr i, vc) { + check.insert (i->video->fade_in ()); } if (check.size() == 1) { - _fade_in->set (ContentTime::from_frames (vc.front()->fade_in (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ()); + _fade_in->set ( + 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->fade_out ()); + BOOST_FOREACH (shared_ptr i, vc) { + check.insert (i->video->fade_out ()); } if (check.size() == 1) { - _fade_out->set (ContentTime::from_frames (vc.front()->fade_out (), vc.front()->video_frame_rate ()), vc.front()->video_frame_rate ()); + _fade_out->set ( + ContentTime::from_frames (vc.front()->video->fade_out (), vc.front()->active_video_frame_rate ()), + vc.front()->active_video_frame_rate () + ); } else { _fade_out->clear (); } @@ -351,7 +378,7 @@ VideoPanel::edit_filters_clicked () void VideoPanel::setup_description () { - VideoContentList vc = _parent->selected_video (); + ContentList vc = _parent->selected_video (); if (vc.empty ()) { checked_set (_description, wxT ("")); return; @@ -360,7 +387,7 @@ VideoPanel::setup_description () return; } - string d = vc.front()->processing_description (); + string d = vc.front()->video->processing_description (); size_t lines = count (d.begin(), d.end(), '\n'); for (int i = lines; i < 6; ++i) { @@ -374,7 +401,7 @@ VideoPanel::setup_description () void VideoPanel::colour_conversion_changed () { - VideoContentList vc = _parent->selected_video (); + ContentList vc = _parent->selected_video (); if (vc.size() != 1) { return; } @@ -383,33 +410,37 @@ VideoPanel::colour_conversion_changed () vector all = PresetColourConversion::all (); if (s == 0) { - vc.front()->unset_colour_conversion (); + vc.front()->video->unset_colour_conversion (); } else if (s == int (all.size() + 1)) { edit_colour_conversion_clicked (); } else { - vc.front()->set_colour_conversion (all[s - 1].conversion); + vc.front()->video->set_colour_conversion (all[s - 1].conversion); } } void VideoPanel::edit_colour_conversion_clicked () { - VideoContentList vc = _parent->selected_video (); + ContentList vc = _parent->selected_video (); if (vc.size() != 1) { return; } - ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->yuv ()); - d->set (vc.front()->colour_conversion().get_value_or (PresetColourConversion::all().front ().conversion)); - d->ShowModal (); - vc.front()->set_colour_conversion (d->get ()); + 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) { + vc.front()->video->set_colour_conversion (d->get ()); + } else { + /* Reset the colour conversion choice */ + film_content_changed (VideoContentProperty::COLOUR_CONVERSION); + } d->Destroy (); } void VideoPanel::content_selection_changed () { - VideoContentList video_sel = _parent->selected_video (); + ContentList video_sel = _parent->selected_video (); _frame_type->set_content (video_sel); _left_crop->set_content (video_sel); @@ -418,11 +449,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); @@ -439,9 +470,9 @@ 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); + setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not); if (_reference->GetValue ()) { _frame_type->wrapped()->Enable (false); @@ -457,7 +488,7 @@ VideoPanel::setup_sensitivity () _filters_button->Enable (false); _colour_conversion->Enable (false); } else { - VideoContentList video_sel = _parent->selected_video (); + ContentList video_sel = _parent->selected_video (); FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg (); bool const single = video_sel.size() == 1; @@ -475,14 +506,14 @@ VideoPanel::setup_sensitivity () _colour_conversion->Enable (single && !video_sel.empty ()); } - VideoContentList vc = _parent->selected_video (); - shared_ptr vcs; + ContentList vc = _parent->selected_video (); + shared_ptr vcs; if (!vc.empty ()) { vcs = vc.front (); } - if (vcs && vcs->colour_conversion ()) { - _edit_colour_conversion_button->Enable (!vcs->colour_conversion().get().preset()); + if (vcs && vcs->video->colour_conversion ()) { + _edit_colour_conversion_button->Enable (!vcs->video->colour_conversion().get().preset()); } else { _edit_colour_conversion_button->Enable (false); } @@ -491,18 +522,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)); } }