From: Carl Hetherington Date: Thu, 8 Jul 2021 22:52:21 +0000 (+0200) Subject: C++11 tidying. X-Git-Tag: v2.15.156~6 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=5d838bc863a7569e68546026c109607fd5a94362 C++11 tidying. --- diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index b4c33f0bc..05ec4a65c 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,10 +18,11 @@ */ -#include "wx_util.h" -#include "static_text.h" -#include "colour_conversion_editor.h" + #include "check_box.h" +#include "colour_conversion_editor.h" +#include "static_text.h" +#include "wx_util.h" #include "lib/colour_conversion.h" #include #include @@ -32,25 +33,29 @@ #include #include -using std::string; + using std::cout; -using std::shared_ptr; using std::dynamic_pointer_cast; +using std::make_shared; +using std::shared_ptr; +using std::string; using boost::bind; using dcp::locale_convert; + int const ColourConversionEditor::INPUT_GAMMA = 0; int const ColourConversionEditor::INPUT_GAMMA_LINEARISED = 1; int const ColourConversionEditor::INPUT_SGAMUT3 = 2; + ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) : wxPanel (parent, wxID_ANY) , _ignore_chromaticity_changed (false) { - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); - wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_Y_GAP - 3, DCPOMATIC_SIZER_X_GAP); + auto table = new wxGridBagSizer (DCPOMATIC_SIZER_Y_GAP - 3, DCPOMATIC_SIZER_X_GAP); overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); int r = 0; @@ -72,7 +77,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) add_label_to_sizer (table, this, _("Input power"), true, wxGBPosition (r, 0)); { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); _input_power = new wxSpinCtrlDouble (this); s->Add (_input_power, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); add_label_to_sizer (s, this, _("threshold"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT); @@ -89,7 +94,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) ++r; wxClientDC dc (parent); - wxSize size = dc.GetTextExtent (wxT ("-0.12345678901")); + auto size = dc.GetTextExtent(wxT("-0.12345678901")); size.SetHeight (-1); wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); @@ -105,9 +110,9 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) /* YUV to RGB conversion */ - wxStaticText* yuv_heading = subhead (table, this, _("YUV to RGB conversion"), r); + auto yuv_heading = subhead (table, this, _("YUV to RGB conversion"), r); - wxStaticText* yuv_label = add_label_to_sizer (table, this, _("YUV to RGB matrix"), true, wxGBPosition (r, 0)); + auto yuv_label = add_label_to_sizer (table, this, _("YUV to RGB matrix"), true, wxGBPosition (r, 0)); _yuv_to_rgb = new wxChoice (this, wxID_ANY); _yuv_to_rgb->Append (_("Rec. 601")); _yuv_to_rgb->Append (_("Rec. 709")); @@ -160,7 +165,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) size = dc.GetTextExtent (wxT ("0.12345678")); size.SetHeight (-1); - wxFlexGridSizer* rgb_to_xyz_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto rgb_to_xyz_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { _rgb_to_xyz[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0); @@ -190,7 +195,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) size = dc.GetTextExtent (wxT ("0.12345678")); size.SetHeight (-1); - wxFlexGridSizer* bradford_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto bradford_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { _bradford[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0); @@ -235,10 +240,11 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) _output->Bind (wxEVT_CHECKBOX, bind (&ColourConversionEditor::changed, this)); } + wxStaticText * ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const { - wxStaticText* m = new StaticText (parent, text); + auto m = new StaticText (parent, text); wxFont font (*wxNORMAL_FONT); font.SetWeight (wxFONTWEIGHT_BOLD); m->SetFont (font); @@ -247,15 +253,16 @@ ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxStri return m; } + void ColourConversionEditor::set (ColourConversion conversion) { - if (dynamic_pointer_cast (conversion.in ())) { - shared_ptr tf = dynamic_pointer_cast (conversion.in ()); + if (dynamic_pointer_cast(conversion.in())) { + auto tf = dynamic_pointer_cast(conversion.in()); checked_set (_input, 0); set_spin_ctrl (_input_gamma, tf->gamma ()); } else if (dynamic_pointer_cast (conversion.in ())) { - shared_ptr tf = dynamic_pointer_cast (conversion.in ()); + auto tf = dynamic_pointer_cast(conversion.in()); checked_set (_input, 1); /* Arbitrary default; not used in this case (greyed out) */ _input_gamma->SetValue (2.2); @@ -263,7 +270,7 @@ ColourConversionEditor::set (ColourConversion conversion) set_text_ctrl (_input_threshold, tf->threshold ()); set_text_ctrl (_input_A, tf->A ()); set_text_ctrl (_input_B, tf->B ()); - } else if (dynamic_pointer_cast (conversion.in ())) { + } else if (dynamic_pointer_cast(conversion.in())) { checked_set (_input, 2); } @@ -301,13 +308,14 @@ ColourConversionEditor::set (ColourConversion conversion) _adjust_white->SetValue (false); } - _output->SetValue (static_cast (dynamic_pointer_cast (conversion.out ()))); + _output->SetValue (static_cast(dynamic_pointer_cast(conversion.out()))); update_rgb_to_xyz (); update_bradford (); changed (); } + ColourConversion ColourConversionEditor::get () const { @@ -316,48 +324,46 @@ ColourConversionEditor::get () const switch (_input->GetSelection ()) { case INPUT_GAMMA: conversion.set_in ( - shared_ptr (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) + make_shared(_input_gamma->GetValue()) ); break; case INPUT_GAMMA_LINEARISED: /* Linearised gamma */ conversion.set_in ( - shared_ptr ( - new dcp::ModifiedGammaTransferFunction ( - _input_power->GetValue (), - locale_convert (wx_to_std (_input_threshold->GetValue ())), - locale_convert (wx_to_std (_input_A->GetValue ())), - locale_convert (wx_to_std (_input_B->GetValue ())) - ) + make_shared( + _input_power->GetValue (), + locale_convert(wx_to_std(_input_threshold->GetValue())), + locale_convert(wx_to_std(_input_A->GetValue())), + locale_convert(wx_to_std(_input_B->GetValue())) ) ); break; case INPUT_SGAMUT3: /* SGamut3 */ - conversion.set_in (shared_ptr (new dcp::SGamut3TransferFunction ())); + conversion.set_in (make_shared()); break; } - conversion.set_yuv_to_rgb (static_cast (_yuv_to_rgb->GetSelection ())); + conversion.set_yuv_to_rgb (static_cast(_yuv_to_rgb->GetSelection())); conversion.set_red ( - dcp::Chromaticity (locale_convert (wx_to_std (_red_x->GetValue ())), locale_convert (wx_to_std (_red_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_red_x->GetValue())), locale_convert(wx_to_std(_red_y->GetValue()))) ); conversion.set_green ( - dcp::Chromaticity (locale_convert (wx_to_std (_green_x->GetValue ())), locale_convert (wx_to_std (_green_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_green_x->GetValue())), locale_convert(wx_to_std(_green_y->GetValue()))) ); conversion.set_blue ( - dcp::Chromaticity (locale_convert (wx_to_std (_blue_x->GetValue ())), locale_convert (wx_to_std (_blue_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_blue_x->GetValue())), locale_convert(wx_to_std(_blue_y->GetValue()))) ); conversion.set_white ( - dcp::Chromaticity (locale_convert (wx_to_std (_white_x->GetValue ())), locale_convert (wx_to_std (_white_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_white_x->GetValue())), locale_convert(wx_to_std(_white_y->GetValue()))) ); - if (_adjust_white->GetValue ()) { - conversion.set_adjusted_white ( - dcp::Chromaticity ( - locale_convert (wx_to_std (_adjusted_white_x->GetValue ())), - locale_convert (wx_to_std (_adjusted_white_y->GetValue ())) + if (_adjust_white->GetValue()) { + conversion.set_adjusted_white( + dcp::Chromaticity( + locale_convert(wx_to_std(_adjusted_white_x->GetValue())), + locale_convert(wx_to_std(_adjusted_white_y->GetValue())) ) ); } else { @@ -365,14 +371,15 @@ ColourConversionEditor::get () const } if (_output->GetValue ()) { - conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (2.6))); + conversion.set_out (make_shared(2.6)); } else { - conversion.set_out (shared_ptr (new dcp::IdentityTransferFunction ())); + conversion.set_out (make_shared()); } return conversion; } + void ColourConversionEditor::changed () { @@ -386,6 +393,7 @@ ColourConversionEditor::changed () Changed (); } + void ColourConversionEditor::chromaticity_changed () { @@ -397,6 +405,7 @@ ColourConversionEditor::chromaticity_changed () changed (); } + void ColourConversionEditor::adjusted_white_changed () { @@ -404,13 +413,14 @@ ColourConversionEditor::adjusted_white_changed () changed (); } + void ColourConversionEditor::update_bradford () { _adjusted_white_x->Enable (_adjust_white->GetValue ()); _adjusted_white_y->Enable (_adjust_white->GetValue ()); - boost::numeric::ublas::matrix m = get().bradford (); + auto m = get().bradford(); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { char buffer[256]; @@ -420,10 +430,11 @@ ColourConversionEditor::update_bradford () } } + void ColourConversionEditor::update_rgb_to_xyz () { - boost::numeric::ublas::matrix m = get().rgb_to_xyz (); + auto m = get().rgb_to_xyz(); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { char buffer[256]; @@ -433,6 +444,7 @@ ColourConversionEditor::update_rgb_to_xyz () } } + void ColourConversionEditor::changed (wxSpinCtrlDouble* sc) { @@ -440,13 +452,14 @@ ColourConversionEditor::changed (wxSpinCtrlDouble* sc) it emits an erroneous changed signal, which messes things up. Check for that here. */ - if (fabs (_last_spin_ctrl_value[sc] - sc->GetValue()) < 1e-3) { + if (fabs(_last_spin_ctrl_value[sc] - sc->GetValue()) < 1e-3) { return; } Changed (); } + void ColourConversionEditor::set_spin_ctrl (wxSpinCtrlDouble* control, double value) { @@ -454,6 +467,7 @@ ColourConversionEditor::set_spin_ctrl (wxSpinCtrlDouble* control, double value) control->SetValue (value); } + void ColourConversionEditor::set_text_ctrl (wxTextCtrl* control, double value) { diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h index 787b615d5..f609daae4 100644 --- a/src/wx/colour_conversion_editor.h +++ b/src/wx/colour_conversion_editor.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,15 +18,20 @@ */ + #ifndef DCPOMATIC_COLOUR_CONVERSION_EDITOR_H #define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H + #include #include + +class wxGridBagSizer; class wxSpinCtrlDouble; class ColourConversion; + class ColourConversionEditor : public wxPanel { public: @@ -79,4 +84,6 @@ private: wxStaticText* _bradford[3][3]; }; + #endif + diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc index da9e1a41b..b970618a7 100644 --- a/src/wx/content_colour_conversion_dialog.cc +++ b/src/wx/content_colour_conversion_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,30 +18,33 @@ */ -#include "wx_util.h" + #include "check_box.h" -#include "content_colour_conversion_dialog.h" #include "colour_conversion_editor.h" +#include "content_colour_conversion_dialog.h" +#include "wx_util.h" #include "lib/colour_conversion.h" #include "lib/config.h" #include "lib/util.h" #include #include + +using std::cout; using std::string; using std::vector; -using std::cout; using boost::optional; + ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, bool yuv) : wxDialog (parent, wxID_ANY, _("Colour conversion")) - , _editor (new ColourConversionEditor (this, yuv)) + , _editor (new ColourConversionEditor(this, yuv)) , _setting (false) { - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP); + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP); _preset_check = new CheckBox (this, _("Use preset")); table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL); _preset_choice = new wxChoice (this, wxID_ANY); @@ -51,7 +54,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND); overall_sizer->Add (_editor); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } @@ -69,12 +72,14 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, } } + ColourConversion ContentColourConversionDialog::get () const { return _editor->get (); } + void ContentColourConversionDialog::set (ColourConversion c) { @@ -85,6 +90,7 @@ ContentColourConversionDialog::set (ColourConversion c) check_for_preset (); } + void ContentColourConversionDialog::check_for_preset () { @@ -92,7 +98,7 @@ ContentColourConversionDialog::check_for_preset () return; } - optional preset = _editor->get().preset (); + auto preset = _editor->get().preset (); _preset_check->SetValue (static_cast(preset)); _preset_choice->Enable (static_cast(preset)); @@ -103,6 +109,7 @@ ContentColourConversionDialog::check_for_preset () } } + void ContentColourConversionDialog::preset_check_clicked () { @@ -115,10 +122,11 @@ ContentColourConversionDialog::preset_check_clicked () } } + void ContentColourConversionDialog::preset_choice_changed () { - vector presets = PresetColourConversion::all (); + auto presets = PresetColourConversion::all (); int const s = _preset_choice->GetCurrentSelection(); if (s != -1) { set (presets[s].conversion); diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h index 471c1f884..d0fb74823 100644 --- a/src/wx/content_colour_conversion_dialog.h +++ b/src/wx/content_colour_conversion_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,15 @@ */ + #include "lib/colour_conversion.h" #include +#include + class ColourConversionEditor; + class ContentColourConversionDialog : public wxDialog { public: @@ -43,3 +47,4 @@ private: boost::signals2::scoped_connection _editor_connection; }; + diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index 4b1e8b229..c5a48f986 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,32 +18,34 @@ */ -#include "filter_dialog.h" -#include "video_panel.h" -#include "wx_util.h" + +#include "check_box.h" #include "content_colour_conversion_dialog.h" -#include "content_widget.h" #include "content_panel.h" -#include "static_text.h" -#include "check_box.h" +#include "content_widget.h" #include "custom_scale_dialog.h" #include "dcpomatic_button.h" -#include "lib/filter.h" -#include "lib/ffmpeg_content.h" +#include "filter_dialog.h" +#include "static_text.h" +#include "video_panel.h" +#include "wx_util.h" #include "lib/colour_conversion.h" #include "lib/config.h" -#include "lib/util.h" -#include "lib/ratio.h" -#include "lib/frame_rate_change.h" #include "lib/dcp_content.h" +#include "lib/ffmpeg_content.h" +#include "lib/filter.h" +#include "lib/frame_rate_change.h" +#include "lib/ratio.h" +#include "lib/util.h" #include "lib/video_content.h" #include #include -#include #include +#include #include #include + using std::vector; using std::string; using std::pair; @@ -66,7 +68,7 @@ VideoPanel::VideoPanel (ContentPanel* p) _reference = new CheckBox (this, _("Use this DCP's video as OV and make VF")); _reference_note = new StaticText (this, wxT("")); _reference_note->Wrap (200); - wxFont font = _reference_note->GetFont(); + auto font = _reference_note->GetFont(); font.SetStyle(wxFONTSTYLE_ITALIC); font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); @@ -160,7 +162,7 @@ VideoPanel::VideoPanel (ContentPanel* p) _fade_out = new Timecode (this); wxClientDC dc (this); - wxSize size = dc.GetTextExtent (wxT ("A quite long name")); + auto size = dc.GetTextExtent (wxT ("A quite long name")); #ifdef __WXGTK3__ size.SetWidth (size.GetWidth() + 64); #endif @@ -221,12 +223,13 @@ VideoPanel::VideoPanel (ContentPanel* p) add_to_grid (); } + void VideoPanel::add_to_grid () { int r = 0; - wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); + auto reference_sizer = new wxBoxSizer (wxVERTICAL); reference_sizer->Add (_reference, 0); reference_sizer->Add (_reference_note, 0); _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 3)); @@ -237,7 +240,7 @@ VideoPanel::add_to_grid () ++r; int cr = 0; - wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto 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), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); @@ -278,9 +281,9 @@ VideoPanel::add_to_grid () add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0)); { - wxSizer* v = new wxBoxSizer (wxVERTICAL); + auto v = new wxBoxSizer (wxVERTICAL); v->Add (_scale_fit, 0, wxBOTTOM, 4); - wxSizer* h = new wxBoxSizer (wxHORIZONTAL); + auto 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); @@ -290,7 +293,7 @@ VideoPanel::add_to_grid () add_label_to_sizer (_grid, _colour_conversion_label, true, wxGBPosition(r, 0)); { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6); s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL); _grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); @@ -305,10 +308,11 @@ VideoPanel::add_to_grid () ++r; } + void VideoPanel::range_changed () { - ContentList vc = _parent->selected_video (); + auto vc = _parent->selected_video (); if (vc.size() != 1) { return; } @@ -345,6 +349,7 @@ VideoPanel::film_changed (Film::Property property) } } + std::size_t hash_value (boost::optional const & c) { @@ -359,10 +364,10 @@ hash_value (boost::optional const & c) void VideoPanel::film_content_changed (int property) { - ContentList vc = _parent->selected_video (); + auto vc = _parent->selected_video (); shared_ptr vcs; shared_ptr fcs; - if (!vc.empty ()) { + if (!vc.empty()) { vcs = vc.front (); fcs = dynamic_pointer_cast (vcs); } @@ -373,7 +378,7 @@ VideoPanel::film_content_changed (int property) property == VideoContentProperty::SCALE) { setup_description (); } else if (property == VideoContentProperty::COLOUR_CONVERSION) { - boost::unordered_set > check; + boost::unordered_set> check; for (auto i: vc) { check.insert (i->video->colour_conversion()); } @@ -381,14 +386,14 @@ VideoPanel::film_content_changed (int property) /* Remove any "Many" entry that we might have added previously. There should * be entries for each preset plus one for "None" and one for "Custom". */ - vector cc = PresetColourConversion::all (); + auto cc = PresetColourConversion::all (); if (_colour_conversion->GetCount() > cc.size() + 2) { _colour_conversion->Delete (_colour_conversion->GetCount() - 1); } if (check.size() == 1) { if (vcs && vcs->video->colour_conversion ()) { - optional preset = vcs->video->colour_conversion().get().preset (); + auto preset = vcs->video->colour_conversion().get().preset(); if (preset) { checked_set (_colour_conversion, preset.get() + 1); } else { @@ -475,7 +480,7 @@ VideoPanel::film_content_changed (int property) void VideoPanel::setup_description () { - ContentList vc = _parent->selected_video (); + auto vc = _parent->selected_video (); if (vc.empty ()) { checked_set (_description, wxT ("")); return; @@ -484,7 +489,7 @@ VideoPanel::setup_description () return; } - string d = vc.front()->video->processing_description (_parent->film()); + auto d = vc.front()->video->processing_description(_parent->film()); size_t lines = count (d.begin(), d.end(), '\n'); for (int i = lines; i < 6; ++i) { @@ -495,13 +500,14 @@ VideoPanel::setup_description () layout (); } + void VideoPanel::colour_conversion_changed () { - ContentList vc = _parent->selected_video (); + auto vc = _parent->selected_video (); int const s = _colour_conversion->GetSelection (); - vector all = PresetColourConversion::all (); + auto all = PresetColourConversion::all (); if (s == int(all.size() + 1)) { edit_colour_conversion_clicked (); @@ -516,12 +522,13 @@ VideoPanel::colour_conversion_changed () } } + void VideoPanel::edit_colour_conversion_clicked () { - ContentList vc = _parent->selected_video (); + auto vc = _parent->selected_video (); - ContentColourConversionDialog* d = new ContentColourConversionDialog (this, vc.front()->video->yuv ()); + auto 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) { for (auto i: vc) { @@ -534,10 +541,11 @@ VideoPanel::edit_colour_conversion_clicked () d->Destroy (); } + void VideoPanel::content_selection_changed () { - ContentList video_sel = _parent->selected_video (); + auto video_sel = _parent->selected_video (); _frame_type->set_content (video_sel); _left_crop->set_content (video_sel); @@ -560,10 +568,11 @@ VideoPanel::content_selection_changed () setup_sensitivity (); } + void VideoPanel::setup_sensitivity () { - ContentList sel = _parent->selected (); + auto sel = _parent->selected (); shared_ptr dcp; if (sel.size() == 1) { @@ -604,8 +613,8 @@ VideoPanel::setup_sensitivity () _colour_conversion->Enable (false); _range->Enable (false); } else { - ContentList video_sel = _parent->selected_video (); - FFmpegContentList ffmpeg_sel = _parent->selected_ffmpeg (); + auto video_sel = _parent->selected_video (); + auto ffmpeg_sel = _parent->selected_ffmpeg (); bool const single = video_sel.size() == 1; _frame_type->wrapped()->Enable (true); @@ -623,7 +632,7 @@ VideoPanel::setup_sensitivity () _range->Enable (single && !video_sel.empty() && !dcp); } - ContentList vc = _parent->selected_video (); + auto vc = _parent->selected_video (); shared_ptr vcs; if (!vc.empty ()) { vcs = vc.front (); @@ -636,22 +645,24 @@ VideoPanel::setup_sensitivity () } } + void VideoPanel::fade_in_changed () { auto const hmsf = _fade_in->get(); for (auto i: _parent->selected_video()) { - double const vfr = i->active_video_frame_rate (_parent->film()); + auto const vfr = i->active_video_frame_rate(_parent->film()); i->video->set_fade_in (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr)); } } + void VideoPanel::fade_out_changed () { auto const hmsf = _fade_out->get(); for (auto i: _parent->selected_video()) { - double const vfr = i->active_video_frame_rate (_parent->film()); + auto const vfr = i->active_video_frame_rate (_parent->film()); i->video->set_fade_out (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr)); } } @@ -660,12 +671,12 @@ VideoPanel::fade_out_changed () void VideoPanel::reference_clicked () { - ContentList c = _parent->selected (); + auto c = _parent->selected (); if (c.size() != 1) { return; } - shared_ptr d = dynamic_pointer_cast (c.front ()); + auto d = dynamic_pointer_cast (c.front ()); if (!d) { return; } @@ -695,8 +706,8 @@ VideoPanel::scale_custom_clicked () 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()); + auto vc = _parent->selected_video().front()->video; + auto 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) { for (auto i: _parent->selected_video()) { diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h index 2e394e4fc..3c51ac152 100644 --- a/src/wx/video_panel.h +++ b/src/wx/video_panel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,21 +18,25 @@ */ + /** @file src/lib/video_panel.h * @brief VideoPanel class. */ + #include "content_sub_panel.h" #include "content_widget.h" #include "timecode.h" #include "lib/film.h" + +class wxButton; class wxChoice; -class wxStaticText; class wxSpinCtrl; -class wxButton; +class wxStaticText; class wxToggleButton; + /** @class VideoPanel * @brief The video tab of the film editor. */