X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.cc;h=527c275a4b10406ec7edad982f033feb556c4f86;hb=94d76e053863b8376db8eda08ffed27a4a49ebf6;hp=c8f1c05634b3d02f1158d024870047dc848b67d8;hpb=e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a;p=dcpomatic.git diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index c8f1c0563..527c275a4 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 . */ @@ -29,9 +30,12 @@ #include "lib/film.h" #include "lib/ffmpeg_content.h" #include "lib/audio_processor.h" +#include "lib/video_content.h" +#include "lib/subtitle_content.h" #include "lib/dcp_content.h" +#include "lib/audio_content.h" +#include #include -#include #include #include #include @@ -49,6 +53,7 @@ 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 film) : _audio_dialog (0) @@ -157,27 +162,27 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr film) grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++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)); - _reel_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::reel_type_changed, this)); - _reel_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::reel_length_changed, this)); - _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this)); - _upload_after_make_dcp->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this)); + _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")); - _reel_type->Append (_("Custom")); + /// TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix + _reel_type->Append (S_("Reel|Custom")); _reel_length->SetRange (1, 64); @@ -270,7 +275,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 @@ -375,13 +380,14 @@ DCPPanel::film_changed (int p) 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: if (_film->audio_channels () < minimum_allowed_audio_channels ()) { _film->set_audio_channels (minimum_allowed_audio_channels ()); } else { - checked_set (_audio_channels, dcp::raw_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); + checked_set (_audio_channels, locale_convert (max (minimum_allowed_audio_channels(), _film->audio_channels ()))); setup_dcp_name (); } break; @@ -399,7 +405,7 @@ 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: @@ -412,6 +418,9 @@ DCPPanel::film_changed (int p) 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; } @@ -420,10 +429,10 @@ DCPPanel::film_changed (int p) void DCPPanel::film_content_changed (int property) { - if (property == AudioContentProperty::AUDIO_STREAMS || - property == SubtitleContentProperty::USE_SUBTITLES || - property == SubtitleContentProperty::BURN_SUBTITLES || - property == VideoContentProperty::VIDEO_SCALE || + if (property == AudioContentProperty::STREAMS || + property == SubtitleContentProperty::USE || + property == SubtitleContentProperty::BURN || + property == VideoContentProperty::SCALE || property == DCPContentProperty::REFERENCE_VIDEO || property == DCPContentProperty::REFERENCE_AUDIO || property == DCPContentProperty::REFERENCE_SUBTITLE) { @@ -436,7 +445,7 @@ 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; @@ -465,7 +474,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]); } @@ -488,6 +497,12 @@ 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); @@ -572,6 +587,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 @@ -637,6 +653,11 @@ DCPPanel::make_video_panel () ++r; } + 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); @@ -655,13 +676,8 @@ DCPPanel::make_video_panel () grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - 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, _("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); @@ -670,24 +686,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)); - _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); @@ -714,17 +728,6 @@ DCPPanel::minimum_allowed_audio_channels () const return min; } -void -DCPPanel::setup_audio_channels_choice () -{ - vector > items; - for (int i = minimum_allowed_audio_channels(); i <= 16; i += 2) { - items.push_back (make_pair (dcp::raw_convert (i), dcp::raw_convert (i))); - } - - checked_set (_audio_channels, items); -} - wxPanel * DCPPanel::make_audio_panel () { @@ -738,7 +741,7 @@ DCPPanel::make_audio_panel () 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; @@ -755,9 +758,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; } @@ -765,7 +768,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); }