X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=5c4d3148d233a7b5850ca68329e2a77e330bd1e7;hb=ae4f0d9f55489ddc50b3e5f0d713621ee8f50645;hp=0759694f8802db016c07506b36559049c95e0ba0;hpb=d71b3fffa09263a2116b3f91981c1999b4ae873c;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 0759694f8..5c4d3148d 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_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 . */ @@ -22,6 +23,7 @@ #include "key_dialog.h" #include "isdcf_metadata_dialog.h" #include "audio_dialog.h" +#include "focus_manager.h" #include "lib/ratio.h" #include "lib/config.h" #include "lib/dcp_content_type.h" @@ -29,27 +31,34 @@ #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/audio_processor.h" +#include "lib/video_content.h" +#include "lib/text_content.h" +#include "lib/dcp_content.h" +#include "lib/audio_content.h" +#include #include -#include #include #include #include #include #include #include +#include using std::cout; using std::list; using std::string; using std::vector; using std::pair; +using std::max; using std::make_pair; using boost::lexical_cast; using boost::shared_ptr; +using dcp::locale_convert; -DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) +DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) : _audio_dialog (0) - , _film (f) + , _film (film) , _generally_sensitive (true) { _panel = new wxPanel (n); @@ -60,16 +69,18 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) _sizer->Add (grid, 0, wxEXPAND | wxALL, 8); int r = 0; - - add_label_to_grid_bag_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0)); + + add_label_to_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0)); _name = new wxTextCtrl (_panel, wxID_ANY); grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT); ++r; - + + FocusManager::instance()->add(_name); + int flags = wxALIGN_CENTER_VERTICAL; #ifdef __WXOSX__ flags |= wxALIGN_RIGHT; -#endif +#endif _use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name")); grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); @@ -95,7 +106,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND); ++r; - add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0)); _dcp_content_type = new wxChoice (_panel, wxID_ANY); grid->Add (_dcp_content_type, wxGBPosition (r, 1)); ++r; @@ -105,11 +116,11 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) _notebook->AddPage (make_video_panel (), _("Video"), false); _notebook->AddPage (make_audio_panel (), _("Audio"), false); - + _signed = new wxCheckBox (_panel, wxID_ANY, _("Signed")); grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - + _encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted")); grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -119,7 +130,7 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) size.SetHeight (-1); { - add_label_to_grid_bag_sizer (grid, _panel, _("Key"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, _panel, _("Key"), true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _key = new wxStaticText (_panel, wxID_ANY, "", wxDefaultPosition, size); s->Add (_key, 1, wxALIGN_CENTER_VERTICAL); @@ -128,27 +139,56 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr f) grid->Add (s, wxGBPosition (r, 1)); ++r; } - - add_label_to_grid_bag_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0)); + + add_label_to_sizer (grid, _panel, _("Reels"), true, wxGBPosition (r, 0)); + _reel_type = new wxChoice (_panel, wxID_ANY); + grid->Add (_reel_type, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; + + add_label_to_sizer (grid, _panel, _("Reel length"), true, wxGBPosition (r, 0)); + + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _reel_length = new wxSpinCtrl (_panel, wxID_ANY); + s->Add (_reel_length); + add_label_to_sizer (s, _panel, _("GB"), false); + grid->Add (s, wxGBPosition (r, 1)); + ++r; + } + + add_label_to_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0)); _standard = new wxChoice (_panel, wxID_ANY); grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); ++r; - _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::name_changed, this)); - _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); - _edit_isdcf_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); - _copy_isdcf_name_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this)); - _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::dcp_content_type_changed, this)); - _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::signed_toggled, this)); - _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::encrypted_toggled, this)); - _edit_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_key_clicked, this)); - _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this)); + _upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Upload DCP to TMS after it is made")); + grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + + _name->Bind (wxEVT_TEXT, boost::bind (&DCPPanel::name_changed, this)); + _use_isdcf_name->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::use_isdcf_name_toggled, this)); + _edit_isdcf_button->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this)); + _copy_isdcf_name_button->Bind(wxEVT_BUTTON, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this)); + _dcp_content_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::dcp_content_type_changed, this)); + _signed->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::signed_toggled, this)); + _encrypted->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::encrypted_toggled, this)); + _edit_key->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_key_clicked, this)); + _reel_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::reel_type_changed, this)); + _reel_length->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::reel_length_changed, this)); + _standard->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::standard_changed, this)); + _upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this)); - vector const ct = DCPContentType::all (); - for (vector::const_iterator i = ct.begin(); i != ct.end(); ++i) { - _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ())); + BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) { + _dcp_content_type->Append (std_to_wx (i->pretty_name ())); } + _reel_type->Append (_("Single reel")); + _reel_type->Append (_("Split by video content")); + /// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix + _reel_type->Append (S_("Reel|Custom")); + + _reel_length->SetRange (1, 64); + _standard->Append (_("SMPTE")); _standard->Append (_("Interop")); @@ -181,7 +221,7 @@ DCPPanel::j2k_bandwidth_changed () if (!_film) { return; } - + _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } @@ -195,16 +235,6 @@ DCPPanel::signed_toggled () _film->set_signed (_signed->GetValue ()); } -void -DCPPanel::burn_subtitles_toggled () -{ - if (!_film) { - return; - } - - _film->set_burn_subtitles (_burn_subtitles->GetValue ()); -} - void DCPPanel::encrypted_toggled () { @@ -214,7 +244,7 @@ DCPPanel::encrypted_toggled () _film->set_encrypted (_encrypted->GetValue ()); } - + /** Called when the frame rate choice widget has been changed */ void DCPPanel::frame_rate_choice_changed () @@ -248,7 +278,7 @@ DCPPanel::audio_channels_changed () return; } - _film->set_audio_channels (dcp::raw_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); + _film->set_audio_channels (locale_convert (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ())))); } void @@ -271,6 +301,16 @@ DCPPanel::standard_changed () _film->set_interop (_standard->GetSelection() == 1); } +void +DCPPanel::upload_after_make_dcp_changed () +{ + if (!_film) { + return; + } + + _film->set_upload_after_make_dcp (_upload_after_make_dcp->GetValue ()); +} + void DCPPanel::film_changed (int p) { @@ -288,9 +328,6 @@ DCPPanel::film_changed (int p) checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ())); setup_dcp_name (); break; - case Film::BURN_SUBTITLES: - checked_set (_burn_subtitles, _film->burn_subtitles ()); - break; case Film::SIGNED: checked_set (_signed, _film->is_signed ()); break; @@ -343,14 +380,19 @@ DCPPanel::film_changed (int p) checked_set (_frame_rate_choice, -1); } - _frame_rate_spin->SetValue (_film->video_frame_rate ()); + checked_set (_frame_rate_spin, _film->video_frame_rate ()); _best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ()); + setup_dcp_name (); break; } case Film::AUDIO_CHANNELS: - checked_set (_audio_channels, dcp::raw_convert (_film->audio_channels ())); - setup_dcp_name (); + if (_film->audio_channels () < minimum_allowed_audio_channels ()) { + _film->set_audio_channels (minimum_allowed_audio_channels ()); + } else { + checked_set (_audio_channels, locale_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); + setup_dcp_name (); + } break; case Film::THREE_D: checked_set (_three_d, _film->three_d ()); @@ -366,9 +408,22 @@ DCPPanel::film_changed (int p) } else { checked_set (_audio_processor, 0); } - setup_audio_channels_choice (); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); film_changed (Film::AUDIO_CHANNELS); break; + case Film::REEL_TYPE: + checked_set (_reel_type, _film->reel_type ()); + _reel_length->Enable (_film->reel_type() == REELTYPE_BY_LENGTH); + break; + case Film::REEL_LENGTH: + checked_set (_reel_length, _film->reel_length() / 1000000000LL); + break; + case Film::UPLOAD_AFTER_MAKE_DCP: + checked_set (_upload_after_make_dcp, _film->upload_after_make_dcp ()); + break; + case Film::CONTENT: + setup_dcp_name (); + break; default: break; } @@ -377,10 +432,15 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == AudioContentProperty::AUDIO_STREAMS || - property == SubtitleContentProperty::USE_SUBTITLES || - property == VideoContentProperty::VIDEO_SCALE) { + if (property == AudioContentProperty::STREAMS || + property == TextContentProperty::USE || + property == TextContentProperty::BURN || + property == VideoContentProperty::SCALE || + property == DCPContentProperty::REFERENCE_VIDEO || + property == DCPContentProperty::REFERENCE_AUDIO || + property == DCPContentProperty::REFERENCE_TEXT) { setup_dcp_name (); + setup_sensitivity (); } } @@ -389,13 +449,13 @@ void DCPPanel::setup_container () { int n = 0; - vector ratios = Ratio::all (); + vector ratios = Ratio::containers (); vector::iterator i = ratios.begin (); while (i != ratios.end() && *i != _film->container ()) { ++i; ++n; } - + if (i == ratios.end()) { checked_set (_container, -1); checked_set (_container_size, wxT ("")); @@ -404,9 +464,9 @@ DCPPanel::setup_container () dcp::Size const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ()); checked_set (_container_size, wxString::Format ("%dx%d", size.width, size.height)); } - + setup_dcp_name (); -} +} /** Called when the container widget has been changed */ void @@ -418,7 +478,7 @@ DCPPanel::container_changed () int const n = _container->GetSelection (); if (n >= 0) { - vector ratios = Ratio::all (); + vector ratios = Ratio::containers (); DCPOMATIC_ASSERT (n < int (ratios.size())); _film->set_container (ratios[n]); } @@ -441,8 +501,14 @@ DCPPanel::dcp_content_type_changed () void DCPPanel::set_film (shared_ptr film) { + /* We are changing film, so destroy any audio dialog for the old one */ + if (_audio_dialog) { + _audio_dialog->Destroy (); + _audio_dialog = 0; + } + _film = film; - + film_changed (Film::NAME); film_changed (Film::USE_ISDCF_NAME); film_changed (Film::CONTENT); @@ -450,48 +516,61 @@ DCPPanel::set_film (shared_ptr film) film_changed (Film::CONTAINER); film_changed (Film::RESOLUTION); film_changed (Film::SIGNED); - film_changed (Film::BURN_SUBTITLES); film_changed (Film::ENCRYPTED); film_changed (Film::KEY); film_changed (Film::J2K_BANDWIDTH); film_changed (Film::ISDCF_METADATA); film_changed (Film::VIDEO_FRAME_RATE); film_changed (Film::AUDIO_CHANNELS); - film_changed (Film::SEQUENCE_VIDEO); + film_changed (Film::SEQUENCE); film_changed (Film::THREE_D); film_changed (Film::INTEROP); film_changed (Film::AUDIO_PROCESSOR); + film_changed (Film::REEL_TYPE); + film_changed (Film::REEL_LENGTH); + film_changed (Film::UPLOAD_AFTER_MAKE_DCP); + + set_general_sensitivity(static_cast(_film)); } void DCPPanel::set_general_sensitivity (bool s) { - _name->Enable (s); - _use_isdcf_name->Enable (s); - _edit_isdcf_button->Enable (s); - _dcp_content_type->Enable (s); - _copy_isdcf_name_button->Enable (s); + _generally_sensitive = s; + setup_sensitivity (); +} + +void +DCPPanel::setup_sensitivity () +{ + _name->Enable (_generally_sensitive); + _use_isdcf_name->Enable (_generally_sensitive); + _edit_isdcf_button->Enable (_generally_sensitive); + _dcp_content_type->Enable (_generally_sensitive); + _copy_isdcf_name_button->Enable (_generally_sensitive); - bool si = s; + bool si = _generally_sensitive; if (_film && _film->encrypted ()) { si = false; } - _burn_subtitles->Enable (s); _signed->Enable (si); - - _encrypted->Enable (s); - _key->Enable (s && _film && _film->encrypted ()); - _edit_key->Enable (s && _film && _film->encrypted ()); - _frame_rate_choice->Enable (s); - _frame_rate_spin->Enable (s); - _audio_channels->Enable (s); - _audio_processor->Enable (s); - _j2k_bandwidth->Enable (s); - _container->Enable (s); - _best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ()); - _resolution->Enable (s); - _three_d->Enable (s); - _standard->Enable (s); + + _encrypted->Enable (_generally_sensitive); + _key->Enable (_generally_sensitive && _film && _film->encrypted ()); + _edit_key->Enable (_generally_sensitive && _film && _film->encrypted ()); + _reel_type->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio()); + _reel_length->Enable (_generally_sensitive && _film && _film->reel_type() == REELTYPE_BY_LENGTH); + _upload_after_make_dcp->Enable (_generally_sensitive); + _frame_rate_choice->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _frame_rate_spin->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _audio_channels->Enable (_generally_sensitive && _film && !_film->references_dcp_audio()); + _audio_processor->Enable (_generally_sensitive && _film && !_film->references_dcp_audio()); + _j2k_bandwidth->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _container->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _best_frame_rate->Enable (_generally_sensitive && _film && _film->best_video_frame_rate () != _film->video_frame_rate ()); + _resolution->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _three_d->Enable (_generally_sensitive && _film && !_film->references_dcp_video()); + _standard->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio()); } void @@ -511,7 +590,7 @@ DCPPanel::edit_isdcf_button_clicked () return; } - ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata ()); + ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ()); d->ShowModal (); _film->set_isdcf_metadata (d->isdcf_metadata ()); d->Destroy (); @@ -521,6 +600,7 @@ void DCPPanel::setup_dcp_name () { _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true))); + _dcp_name->SetToolTip (std_to_wx (_film->dcp_name (true))); } void @@ -529,7 +609,7 @@ DCPPanel::best_frame_rate_clicked () if (!_film) { return; } - + _film->set_video_frame_rate (_film->best_video_frame_rate ()); } @@ -574,8 +654,8 @@ DCPPanel::make_video_panel () panel->SetSizer (sizer); int r = 0; - - add_label_to_grid_bag_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0)); + + add_label_to_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0)); { wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _container = new wxChoice (panel, wxID_ANY); @@ -586,7 +666,12 @@ DCPPanel::make_video_panel () ++r; } - add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0)); + _resolution = new wxChoice (panel, wxID_ANY); + grid->Add (_resolution, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0)); { _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL); _frame_rate_choice = new wxChoice (panel, wxID_ANY); @@ -600,21 +685,12 @@ DCPPanel::make_video_panel () ++r; } - _burn_subtitles = new wxCheckBox (panel, wxID_ANY, _("Burn subtitles into image")); - grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; - _three_d = new wxCheckBox (panel, wxID_ANY, _("3D")); grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - add_label_to_grid_bag_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0)); - _resolution = new wxChoice (panel, wxID_ANY); - grid->Add (_resolution, wxGBPosition (r, 1)); - ++r; - { - add_label_to_grid_bag_sizer (grid, panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true, wxGBPosition (r, 0)); wxSizer* s = new wxBoxSizer (wxHORIZONTAL); _j2k_bandwidth = new wxSpinCtrl (panel, wxID_ANY); s->Add (_j2k_bandwidth, 1); @@ -623,25 +699,22 @@ DCPPanel::make_video_panel () } ++r; - _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::container_changed, this)); - _frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::frame_rate_choice_changed, this)); - _frame_rate_spin->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::frame_rate_spin_changed, this)); - _best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::best_frame_rate_clicked, this)); - _burn_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::burn_subtitles_toggled, this)); - _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); - /* Also listen to wxEVT_COMMAND_TEXT_UPDATED so that typing numbers directly in is always noticed */ - _j2k_bandwidth->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); - _resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::resolution_changed, this)); - _three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::three_d_changed, this)); + _container->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::container_changed, this)); + _frame_rate_choice->Bind(wxEVT_CHOICE, boost::bind (&DCPPanel::frame_rate_choice_changed, this)); + _frame_rate_spin->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::frame_rate_spin_changed, this)); + _best_frame_rate->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::best_frame_rate_clicked, this)); + _j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); + /* Also listen to wxEVT_TEXT so that typing numbers directly in is always noticed */ + _j2k_bandwidth->Bind (wxEVT_TEXT, boost::bind (&DCPPanel::j2k_bandwidth_changed, this)); + _resolution->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::resolution_changed, this)); + _three_d->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::three_d_changed, this)); - vector const ratio = Ratio::all (); - for (vector::const_iterator i = ratio.begin(); i != ratio.end(); ++i) { - _container->Append (std_to_wx ((*i)->nickname ())); + BOOST_FOREACH (Ratio const * i, Ratio::containers()) { + _container->Append (std_to_wx(i->container_nickname())); } - list const dfr = Config::instance()->allowed_dcp_frame_rates (); - for (list::const_iterator i = dfr.begin(); i != dfr.end(); ++i) { - _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (*i))); + BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) { + _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (i))); } _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); @@ -653,8 +726,8 @@ DCPPanel::make_video_panel () return panel; } -void -DCPPanel::setup_audio_channels_choice () +int +DCPPanel::minimum_allowed_audio_channels () const { int min = 2; if (_film && _film->audio_processor ()) { @@ -665,12 +738,7 @@ DCPPanel::setup_audio_channels_choice () ++min; } - vector > items; - for (int i = min; i <= 12; i += 2) { - items.push_back (make_pair (dcp::raw_convert (i), dcp::raw_convert (i))); - } - - checked_set (_audio_channels, items); + return min; } wxPanel * @@ -683,14 +751,14 @@ DCPPanel::make_audio_panel () panel->SetSizer (sizer); int r = 0; - - add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0)); + + add_label_to_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0)); _audio_channels = new wxChoice (panel, wxID_ANY); - setup_audio_channels_choice (); + setup_audio_channels_choice (_audio_channels, minimum_allowed_audio_channels ()); grid->Add (_audio_channels, wxGBPosition (r, 1)); ++r; - add_label_to_grid_bag_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0)); + add_label_to_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0)); _audio_processor = new wxChoice (panel, wxID_ANY); _audio_processor->Append (_("None"), new wxStringClientData (N_("none"))); BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::all ()) { @@ -703,9 +771,9 @@ DCPPanel::make_audio_panel () grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - _audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_channels_changed, this)); - _audio_processor->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_processor_changed, this)); - _show_audio->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::show_audio_clicked, this)); + _audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this)); + _audio_processor->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_processor_changed, this)); + _show_audio->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::show_audio_clicked, this)); return panel; } @@ -713,7 +781,7 @@ DCPPanel::make_audio_panel () void DCPPanel::copy_isdcf_name_button_clicked () { - _film->set_name (_film->isdcf_name (false)); + _film->set_name (_film->isdcf_name (true)); _film->set_use_isdcf_name (false); } @@ -739,8 +807,27 @@ DCPPanel::show_audio_clicked () _audio_dialog->Destroy (); _audio_dialog = 0; } - + AudioDialog* d = new AudioDialog (_panel, _film); d->Show (); - d->set_playlist (_film->playlist ()); +} + +void +DCPPanel::reel_type_changed () +{ + if (!_film) { + return; + } + + _film->set_reel_type (static_cast (_reel_type->GetSelection ())); +} + +void +DCPPanel::reel_length_changed () +{ + if (!_film) { + return; + } + + _film->set_reel_length (_reel_length->GetValue() * 1000000000LL); }