X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=fa791550cce0aeb49c2ea07ffb37ea1e611276de;hb=97948f1b522f3a7fd2ad53559690b98728ea5f0a;hp=5030f78371461c8535e99d3a5be64ea215b95981;hpb=dcf3d9cc30592457f2485cb71aed29bd0da67e60;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 5030f7837..fa791550c 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -17,6 +17,12 @@ */ +#include "filter_dialog.h" +#include "video_panel.h" +#include "wx_util.h" +#include "content_colour_conversion_dialog.h" +#include "content_widget.h" +#include "content_panel.h" #include "lib/filter.h" #include "lib/ffmpeg_content.h" #include "lib/colour_conversion.h" @@ -24,15 +30,11 @@ #include "lib/util.h" #include "lib/ratio.h" #include "lib/frame_rate_change.h" -#include "filter_dialog.h" -#include "video_panel.h" -#include "wx_util.h" -#include "content_colour_conversion_dialog.h" -#include "content_widget.h" -#include "content_panel.h" +#include "lib/dcp_content.h" #include #include #include +#include using std::vector; using std::string; @@ -75,7 +77,11 @@ VideoPanel::VideoPanel (ContentPanel* p) int r = 0; - add_label_to_grid_bag_sizer (grid, this, _("Type"), true, wxGBPosition (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), @@ -88,10 +94,12 @@ VideoPanel::VideoPanel (ContentPanel* p) _frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); ++r; + add_label_to_sizer (grid, this, _("Crop"), true, wxGBPosition (r, 0)); + int cr = 0; wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - add_label_to_grid_bag_sizer (crop, this, _("Left crop"), true, wxGBPosition (cr, 0)); + add_label_to_sizer (crop, this, _("Left"), true, wxGBPosition (cr, 0)); _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -101,7 +109,7 @@ VideoPanel::VideoPanel (ContentPanel* p) ); _left_crop->add (crop, wxGBPosition (cr, 1)); - add_label_to_grid_bag_sizer (crop, this, _("Right crop"), true, wxGBPosition (cr, 2)); + add_label_to_sizer (crop, this, _("Right"), true, wxGBPosition (cr, 2)); _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -112,8 +120,8 @@ VideoPanel::VideoPanel (ContentPanel* p) _right_crop->add (crop, wxGBPosition (cr, 3)); ++cr; - - add_label_to_grid_bag_sizer (crop, this, _("Top crop"), true, wxGBPosition (cr, 0)); + + add_label_to_sizer (crop, this, _("Top"), true, wxGBPosition (cr, 0)); _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -123,7 +131,7 @@ VideoPanel::VideoPanel (ContentPanel* p) ); _top_crop->add (crop, wxGBPosition (cr, 1)); - add_label_to_grid_bag_sizer (crop, this, _("Bottom crop"), true, wxGBPosition (cr, 2)); + add_label_to_sizer (crop, this, _("Bottom"), true, wxGBPosition (cr, 2)); _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -133,20 +141,20 @@ VideoPanel::VideoPanel (ContentPanel* p) ); _bottom_crop->add (crop, wxGBPosition (cr, 3)); - grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 3)); + grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3)); r += 2; - add_label_to_grid_bag_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0)); _fade_in = new Timecode (this); grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3)); ++r; - add_label_to_grid_bag_sizer (grid, this, _("Fade out"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, this, _("Fade out"), true, wxGBPosition (r, 0)); _fade_out = new Timecode (this); grid->Add (_fade_out, wxGBPosition (r, 1), wxGBSpan (1, 3)); ++r; - - add_label_to_grid_bag_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0)); + + add_label_to_sizer (grid, this, _("Scale to"), true, wxGBPosition (r, 0)); _scale = new ContentChoice ( this, new wxChoice (this, wxID_ANY), @@ -162,22 +170,24 @@ VideoPanel::VideoPanel (ContentPanel* p) wxClientDC dc (this); wxSize size = dc.GetTextExtent (wxT ("A quite long name")); size.SetHeight (-1); - - add_label_to_grid_bag_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0)); - _filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size); - grid->Add (_filters, wxGBPosition (r, 1), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL); - _filters_button = new wxButton (this, wxID_ANY, _("Edit...")); - grid->Add (_filters_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + + add_label_to_sizer (grid, this, _("Filters"), true, wxGBPosition (r, 0)); + { + 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); + _filters_button = new wxButton (this, wxID_ANY, _("Edit...")); + s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL); + + grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + } ++r; - add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0)); { wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxClientDC dc (this); - wxSize size = dc.GetTextExtent (wxT ("A quite long-ish name")); - size.SetHeight (-1); - _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size); _colour_conversion->Append (_("None")); BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) { @@ -185,16 +195,16 @@ VideoPanel::VideoPanel (ContentPanel* p) } _colour_conversion->Append (_("Custom")); s->Add (_colour_conversion, 1, wxEXPAND | 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); - + grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); } ++r; _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 | wxALL, 6); + 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); @@ -206,10 +216,9 @@ VideoPanel::VideoPanel (ContentPanel* p) _right_crop->wrapped()->SetRange (0, 1024); _bottom_crop->wrapped()->SetRange (0, 1024); - vector scales = VideoContentScale::all (); _scale->wrapped()->Clear (); - for (vector::iterator i = scales.begin(); i != scales.end(); ++i) { - _scale->wrapped()->Append (std_to_wx (i->name ())); + BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) { + _scale->wrapped()->Append (std_to_wx (i.name ())); } _frame_type->wrapped()->Append (_("2D")); @@ -221,10 +230,11 @@ 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)); - - _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_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)); } void @@ -236,6 +246,8 @@ VideoPanel::film_changed (Film::Property property) case Film::RESOLUTION: setup_description (); break; + case Film::REEL_TYPE: + setup_sensitivity (); default: break; } @@ -251,7 +263,7 @@ VideoPanel::film_content_changed (int property) vcs = vc.front (); fcs = dynamic_pointer_cast (vcs); } - + if (property == VideoContentProperty::VIDEO_FRAME_TYPE) { setup_description (); } else if (property == VideoContentProperty::VIDEO_CROP) { @@ -261,23 +273,20 @@ VideoPanel::film_content_changed (int property) } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) { setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { - if (!vcs) { - checked_set (_colour_conversion, 0); - _edit_colour_conversion_button->Enable (false); - } else if (vcs->colour_conversion ()) { + if (vcs && vcs->colour_conversion ()) { optional preset = vcs->colour_conversion().get().preset (); vector cc = PresetColourConversion::all (); if (preset) { checked_set (_colour_conversion, preset.get() + 1); - _edit_colour_conversion_button->Enable (false); } else { checked_set (_colour_conversion, cc.size() + 1); - _edit_colour_conversion_button->Enable (true); } } else { checked_set (_colour_conversion, 0); - _edit_colour_conversion_button->Enable (false); } + + setup_sensitivity (); + } else if (property == FFmpegContentProperty::FILTERS) { if (fcs) { string p = Filter::ffmpeg_string (fcs->filters ()); @@ -292,10 +301,10 @@ VideoPanel::film_content_changed (int property) } } else if (property == VideoContentProperty::VIDEO_FADE_IN) { set check; - for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) { - check.insert ((*i)->fade_in ()); + BOOST_FOREACH (shared_ptr i, vc) { + check.insert (i->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 ()); } else { @@ -303,15 +312,24 @@ VideoPanel::film_content_changed (int property) } } else if (property == VideoContentProperty::VIDEO_FADE_OUT) { set check; - for (VideoContentList::const_iterator i = vc.begin (); i != vc.end(); ++i) { - check.insert ((*i)->fade_out ()); + BOOST_FOREACH (shared_ptr i, vc) { + check.insert (i->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 ()); } else { _fade_out->clear (); } + } else if (property == DCPContentProperty::REFERENCE_VIDEO) { + if (vc.size() == 1) { + shared_ptr dcp = dynamic_pointer_cast (vc.front ()); + checked_set (_reference, dcp ? dcp->reference_video () : false); + } else { + checked_set (_reference, false); + } + + setup_sensitivity (); } } @@ -381,7 +399,7 @@ VideoPanel::edit_colour_conversion_clicked () return; } - ContentColourConversionDialog* d = new ContentColourConversionDialog (this); + 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 ()); @@ -392,45 +410,114 @@ void VideoPanel::content_selection_changed () { VideoContentList video_sel = _parent->selected_video (); - FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg (); - - bool const single = video_sel.size() == 1; _frame_type->set_content (video_sel); _left_crop->set_content (video_sel); _right_crop->set_content (video_sel); _top_crop->set_content (video_sel); _bottom_crop->set_content (video_sel); - _fade_in->Enable (!video_sel.empty ()); - _fade_out->Enable (!video_sel.empty ()); _scale->set_content (video_sel); - _filters_button->Enable (single && !ffmpeg_sel.empty ()); - film_content_changed (VideoContentProperty::VIDEO_CROP); film_content_changed (VideoContentProperty::VIDEO_FRAME_RATE); film_content_changed (VideoContentProperty::COLOUR_CONVERSION); film_content_changed (VideoContentProperty::VIDEO_FADE_IN); film_content_changed (VideoContentProperty::VIDEO_FADE_OUT); film_content_changed (FFmpegContentProperty::FILTERS); + film_content_changed (DCPContentProperty::REFERENCE_VIDEO); + + setup_sensitivity (); } void -VideoPanel::fade_in_changed () +VideoPanel::setup_sensitivity () { + ContentList sel = _parent->selected (); + + shared_ptr dcp; + if (sel.size() == 1) { + dcp = dynamic_pointer_cast (sel.front ()); + } + + list why_not; + bool const can_reference = dcp && dcp->can_reference_video (why_not); + setup_refer_button (_reference, dcp, can_reference, why_not); + + if (_reference->GetValue ()) { + _frame_type->wrapped()->Enable (false); + _left_crop->wrapped()->Enable (false); + _right_crop->wrapped()->Enable (false); + _top_crop->wrapped()->Enable (false); + _bottom_crop->wrapped()->Enable (false); + _fade_in->Enable (false); + _fade_out->Enable (false); + _scale->wrapped()->Enable (false); + _description->Enable (false); + _filters->Enable (false); + _filters_button->Enable (false); + _colour_conversion->Enable (false); + } else { + VideoContentList video_sel = _parent->selected_video (); + FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg (); + bool const single = video_sel.size() == 1; + + _frame_type->wrapped()->Enable (true); + _left_crop->wrapped()->Enable (true); + _right_crop->wrapped()->Enable (true); + _top_crop->wrapped()->Enable (true); + _bottom_crop->wrapped()->Enable (true); + _fade_in->Enable (!video_sel.empty ()); + _fade_out->Enable (!video_sel.empty ()); + _scale->wrapped()->Enable (true); + _description->Enable (true); + _filters->Enable (true); + _filters_button->Enable (single && !ffmpeg_sel.empty ()); + _colour_conversion->Enable (single && !video_sel.empty ()); + } + VideoContentList vc = _parent->selected_video (); - for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) { + shared_ptr vcs; + if (!vc.empty ()) { + vcs = vc.front (); + } + + if (vcs && vcs->colour_conversion ()) { + _edit_colour_conversion_button->Enable (!vcs->colour_conversion().get().preset()); + } else { + _edit_colour_conversion_button->Enable (false); + } +} + +void +VideoPanel::fade_in_changed () +{ + 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 (vfr)); + i->set_fade_in (_fade_in->get (vfr).frames_round (vfr)); } } void VideoPanel::fade_out_changed () { - VideoContentList vc = _parent->selected_video (); - for (VideoContentList::const_iterator i = vc.begin(); i != vc.end(); ++i) { + 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 (vfr)); + i->set_fade_out (_fade_out->get (vfr).frames_round (vfr)); } } + +void +VideoPanel::reference_clicked () +{ + ContentList c = _parent->selected (); + if (c.size() != 1) { + return; + } + + shared_ptr d = dynamic_pointer_cast (c.front ()); + if (!d) { + return; + } + + d->set_reference_video (_reference->GetValue ()); +}