X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_panel.cc;h=0f241506e6a29f8f0083f23703c2106a5e9088b1;hb=5229b795b9d7cafe174496fbc6bca8d62f4a3ff0;hp=a8510cbbab38d4b3dd9776d268ffff24c5b13da0;hpb=f90d74f7a0382f0dc63eef81bd553d7a7b38edb2;p=dcpomatic.git diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index a8510cbba..0f241506e 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -17,7 +17,6 @@ */ -#include #include "lib/filter.h" #include "lib/ffmpeg_content.h" #include "lib/colour_conversion.h" @@ -31,6 +30,8 @@ #include "content_colour_conversion_dialog.h" #include "content_widget.h" #include "content_panel.h" +#include +#include using std::vector; using std::string; @@ -47,8 +48,8 @@ static VideoContentScale index_to_scale (int n) { vector scales = VideoContentScale::all (); - assert (n >= 0); - assert (n < int (scales.size ())); + DCPOMATIC_ASSERT (n >= 0); + DCPOMATIC_ASSERT (n < int (scales.size ())); return scales[n]; } @@ -62,7 +63,7 @@ scale_to_index (VideoContentScale scale) } } - assert (false); + DCPOMATIC_ASSERT (false); } VideoPanel::VideoPanel (ContentPanel* p) @@ -85,8 +86,11 @@ VideoPanel::VideoPanel (ContentPanel* p) ); _frame_type->add (grid, wxGBPosition (r, 1), wxGBSpan (1, 2)); ++r; - - add_label_to_grid_bag_sizer (grid, this, _("Left 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)); _left_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -94,9 +98,9 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::left_crop), boost::mem_fn (&VideoContent::set_left_crop) ); - _left_crop->add (grid, wxGBPosition (r, 1)); + _left_crop->add (crop, wxGBPosition (cr, 1)); - add_label_to_grid_bag_sizer (grid, this, _("Right crop"), true, wxGBPosition (r, 2)); + add_label_to_grid_bag_sizer (crop, this, _("Right crop"), true, wxGBPosition (cr, 2)); _right_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -104,11 +108,11 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::right_crop), boost::mem_fn (&VideoContent::set_right_crop) ); - _right_crop->add (grid, wxGBPosition (r, 3)); - - ++r; + _right_crop->add (crop, wxGBPosition (cr, 3)); + + ++cr; - add_label_to_grid_bag_sizer (grid, this, _("Top crop"), true, wxGBPosition (r, 0)); + add_label_to_grid_bag_sizer (crop, this, _("Top crop"), true, wxGBPosition (cr, 0)); _top_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -116,9 +120,9 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::top_crop), boost::mem_fn (&VideoContent::set_top_crop) ); - _top_crop->add (grid, wxGBPosition (r, 1)); - - add_label_to_grid_bag_sizer (grid, this, _("Bottom crop"), true, wxGBPosition (r, 2)); + _top_crop->add (crop, wxGBPosition (cr, 1)); + + add_label_to_grid_bag_sizer (crop, this, _("Bottom crop"), true, wxGBPosition (cr, 2)); _bottom_crop = new ContentSpinCtrl ( this, new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)), @@ -126,9 +130,10 @@ VideoPanel::VideoPanel (ContentPanel* p) boost::mem_fn (&VideoContent::bottom_crop), boost::mem_fn (&VideoContent::set_bottom_crop) ); - _bottom_crop->add (grid, wxGBPosition (r, 3)); - - ++r; + _bottom_crop->add (crop, wxGBPosition (cr, 3)); + + grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 3)); + r += 2; add_label_to_grid_bag_sizer (grid, this, _("Fade in"), true, wxGBPosition (r, 0)); _fade_in = new Timecode (this); @@ -164,9 +169,10 @@ VideoPanel::VideoPanel (ContentPanel* p) grid->Add (_filters_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); ++r; - add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0)); + _enable_colour_conversion = new wxCheckBox (this, wxID_ANY, _("Colour conversion")); + grid->Add (_enable_colour_conversion, wxGBPosition (r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL); _colour_conversion = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size); - grid->Add (_colour_conversion, wxGBPosition (r, 1), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL); + grid->Add (_colour_conversion, wxGBPosition (r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); _colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit...")); grid->Add (_colour_conversion_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); ++r; @@ -201,6 +207,7 @@ VideoPanel::VideoPanel (ContentPanel* p) _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)); + _enable_colour_conversion->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::enable_colour_conversion_clicked, this)); _colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this)); } @@ -238,16 +245,35 @@ VideoPanel::film_content_changed (int property) } else if (property == VideoContentProperty::VIDEO_FRAME_RATE) { setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { - optional preset = vcs ? vcs->colour_conversion().preset () : optional (); - vector cc = Config::instance()->colour_conversions (); - _colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom")); + if (!vcs) { + checked_set (_colour_conversion, wxT ("")); + } else if (vcs->colour_conversion ()) { + optional preset = vcs->colour_conversion().get().preset (); + vector cc = PresetColourConversion::all (); + if (preset) { + checked_set (_colour_conversion, std_to_wx (cc[preset.get()].name)); + } else { + checked_set (_colour_conversion, _("Custom")); + } + _enable_colour_conversion->SetValue (true); + _colour_conversion->Enable (true); + _colour_conversion_button->Enable (true); + } else { + checked_set (_colour_conversion, _("None")); + _enable_colour_conversion->SetValue (false); + _colour_conversion->Enable (false); + _colour_conversion_button->Enable (false); + } } else if (property == FFmpegContentProperty::FILTERS) { if (fcs) { - string const p = Filter::ffmpeg_string (fcs->filters ()); + string p = Filter::ffmpeg_string (fcs->filters ()); if (p.empty ()) { - _filters->SetLabel (_("None")); + checked_set (_filters, _("None")); } else { - _filters->SetLabel (std_to_wx (p)); + if (p.length() > 25) { + p = p.substr (0, 25) + "..."; + } + checked_set (_filters, p); } } } else if (property == VideoContentProperty::VIDEO_FADE_IN) { @@ -295,72 +321,21 @@ VideoPanel::setup_description () { VideoContentList vc = _parent->selected_video (); if (vc.empty ()) { - _description->SetLabel (""); + checked_set (_description, wxT ("")); return; } else if (vc.size() > 1) { - _description->SetLabel (_("Multiple content selected")); + checked_set (_description, _("Multiple content selected")); return; } - shared_ptr vcs = vc.front (); - - wxString d; - - int lines = 0; - - if (vcs->video_size().width && vcs->video_size().height) { - d << wxString::Format ( - _("Content video is %dx%d (%.2f:1)\n"), - vcs->video_size_after_3d_split().width, - vcs->video_size_after_3d_split().height, - vcs->video_size_after_3d_split().ratio () - ); - ++lines; - } - - Crop const crop = vcs->crop (); - if ((crop.left || crop.right || crop.top || crop.bottom) && vcs->video_size() != dcp::Size (0, 0)) { - dcp::Size cropped = vcs->video_size_after_crop (); - d << wxString::Format ( - _("Cropped to %dx%d (%.2f:1)\n"), - cropped.width, cropped.height, - cropped.ratio () - ); - ++lines; - } - - dcp::Size const container_size = _parent->film()->frame_size (); - dcp::Size const scaled = vcs->scale().size (vcs, container_size, container_size, 1); - - if (scaled != vcs->video_size_after_crop ()) { - d << wxString::Format ( - _("Scaled to %dx%d (%.2f:1)\n"), - scaled.width, scaled.height, - scaled.ratio () - ); - ++lines; - } - - if (scaled != container_size) { - d << wxString::Format ( - _("Padded with black to %dx%d (%.2f:1)\n"), - container_size.width, container_size.height, - container_size.ratio () - ); - ++lines; - } - - d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ()); - ++lines; - FrameRateChange frc (vcs->video_frame_rate(), _parent->film()->video_frame_rate ()); - d << std_to_wx (frc.description ()) << "\n"; - ++lines; + string d = vc.front()->processing_description (); + size_t lines = count (d.begin(), d.end(), '\n'); for (int i = lines; i < 6; ++i) { - d << wxT ("\n "); + d += "\n "; } - _description->SetLabel (d); + checked_set (_description, d); _sizer->Layout (); } @@ -372,7 +347,11 @@ VideoPanel::edit_colour_conversion_clicked () return; } - ColourConversion conversion = vc.front()->colour_conversion (); + if (!vc.front()->colour_conversion ()) { + return; + } + + ColourConversion conversion = vc.front()->colour_conversion().get (); ContentColourConversionDialog* d = new ContentColourConversionDialog (this); d->set (conversion); d->ShowModal (); @@ -389,14 +368,17 @@ VideoPanel::content_selection_changed () 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); - _frame_type->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 ()); + _enable_colour_conversion->Enable (single); _colour_conversion_button->Enable (single); film_content_changed (VideoContentProperty::VIDEO_CROP); @@ -424,3 +406,18 @@ VideoPanel::fade_out_changed () (*i)->set_fade_out (_fade_out->get (_parent->film()->video_frame_rate ())); } } + +void +VideoPanel::enable_colour_conversion_clicked () +{ + VideoContentList vc = _parent->selected_video (); + if (vc.size() != 1) { + return; + } + + if (_enable_colour_conversion->GetValue()) { + vc.front()->set_default_colour_conversion (); + } else { + vc.front()->unset_colour_conversion (); + } +}