X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=c82956c608a2cf1ad86c85434ad58034c76a956b;hb=fe9d2a290682021cd12a00bf21fa4db3012e2049;hp=af4a04e2edd1bbf99ea5fef9c1bbf7c35f752afe;hpb=5317f5a6f3415aec5d6e99ca7e6fc89d735bc700;p=dcpomatic.git diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index af4a04e2e..c82956c60 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1,19 +1,20 @@ /* 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 . */ @@ -31,6 +32,7 @@ #include "server_dialog.h" #include "make_chain_dialog.h" #include "email_dialog.h" +#include "name_format_editor.h" #include "lib/config.h" #include "lib/ratio.h" #include "lib/filter.h" @@ -42,6 +44,7 @@ #include "lib/exceptions.h" #include #include +#include #include #include #include @@ -200,7 +203,7 @@ private: table->Add (_cinemas_file, wxGBPosition (r, 1)); ++r; -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG _analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("Find integrated loudness, true peak and loudness range when analysing audio")); table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -239,7 +242,7 @@ private: _num_local_encoding_threads->SetRange (1, 128); _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this)); -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG _analyse_ebur128->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::analyse_ebur128_changed, this)); #endif _automatic_audio_analysis->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::automatic_audio_analysis_changed, this)); @@ -281,7 +284,7 @@ private: checked_set (_language, lang); checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ()); -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG checked_set (_analyse_ebur128, config->analyse_ebur128 ()); #endif checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ()); @@ -320,7 +323,7 @@ private: } } -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG void analyse_ebur128_changed () { Config::instance()->set_analyse_ebur128 (_analyse_ebur128->GetValue ()); @@ -366,7 +369,7 @@ private: wxChoice* _language; wxSpinCtrl* _num_local_encoding_threads; FilePickerCtrl* _cinemas_file; -#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG wxCheckBox* _analyse_ebur128; #endif wxCheckBox* _automatic_audio_analysis; @@ -431,6 +434,10 @@ private: _dcp_content_type = new wxChoice (_panel, wxID_ANY); table->Add (_dcp_content_type); + add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true); + _dcp_audio_channels = new wxChoice (_panel, wxID_ANY); + table->Add (_dcp_audio_channels); + { add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); @@ -472,7 +479,10 @@ private: _dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ())); } + setup_audio_channels_choice (_dcp_audio_channels, 2); + _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this)); + _dcp_audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_audio_channels_changed, this)); _j2k_bandwidth->SetRange (50, 250); _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this)); @@ -507,6 +517,7 @@ private: _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ())); checked_set (_j2k_bandwidth, config->default_j2k_bandwidth() / 1000000); _j2k_bandwidth->SetRange (50, config->maximum_j2k_bandwidth() / 1000000); + checked_set (_dcp_audio_channels, raw_convert (config->default_dcp_audio_channels())); checked_set (_audio_delay, config->default_audio_delay ()); checked_set (_standard, config->default_interop() ? 1 : 0); } @@ -521,6 +532,14 @@ private: Config::instance()->set_default_audio_delay (_audio_delay->GetValue()); } + void dcp_audio_channels_changed () + { + int const s = _dcp_audio_channels->GetSelection (); + if (s != wxNOT_FOUND) { + Config::instance()->set_default_dcp_audio_channels (dcp::raw_convert (string_client_data (_dcp_audio_channels->GetClientObject (s)))); + } + } + void directory_changed () { Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ())); @@ -567,6 +586,7 @@ private: #endif wxChoice* _container; wxChoice* _dcp_content_type; + wxChoice* _dcp_audio_channels; wxChoice* _standard; }; @@ -752,6 +772,13 @@ private: if (d->ShowModal() == wxID_OK) { try { dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ()))); + if (c.extra_data ()) { + message_dialog ( + this, + _("This file contains other certificates (or other data) after its first certificate. " + "Only the first certificate will be used.") + ); + } _chain->add (c); _set (_chain); update_certificate_list (); @@ -1372,6 +1399,24 @@ private: table->Add (_only_servers_encode, 1, wxEXPAND | wxALL); table->AddSpacer (0); + { + int flags = wxALIGN_TOP | wxTOP | wxLEFT; + wxString t = _("DCP filename format"); +#ifdef __WXOSX__ + flags |= wxALIGN_RIGHT; + t += wxT (":"); +#endif + wxStaticText* m = new wxStaticText (_panel, wxID_ANY, t); + table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); + } + + _dcp_filename_format = new NameFormatEditor (_panel, Config::instance()->dcp_filename_format()); + dcp::NameFormat::Map example; + example["type"] = "j2c"; + example["id"] = "eb1c112c-ca3c-4ae6-9263-c6714ff05d64"; + _dcp_filename_format->set_example (example); + table->Add (_dcp_filename_format->panel(), 1, wxEXPAND | wxALL); + #ifdef __WXOSX__ wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:")); table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6); @@ -1388,6 +1433,7 @@ private: t->Add (_log_warning, 1, wxEXPAND | wxALL); _log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors")); t->Add (_log_error, 1, wxEXPAND | wxALL); + /// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix _log_timing = new wxCheckBox (_panel, wxID_ANY, S_("Config|Timing")); t->Add (_log_timing, 1, wxEXPAND | wxALL); _log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode")); @@ -1409,6 +1455,7 @@ private: _maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this)); _allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this)); _only_servers_encode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::only_servers_encode_changed, this)); + _dcp_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_filename_format_changed, this)); _log_general->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); _log_warning->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); _log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); @@ -1455,6 +1502,11 @@ private: Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ()); } + void dcp_filename_format_changed () + { + Config::instance()->set_dcp_filename_format (_dcp_filename_format->get ()); + } + void log_changed () { int types = 0; @@ -1492,6 +1544,7 @@ private: wxSpinCtrl* _maximum_j2k_bandwidth; wxCheckBox* _allow_any_dcp_frame_rate; wxCheckBox* _only_servers_encode; + NameFormatEditor* _dcp_filename_format; wxCheckBox* _log_general; wxCheckBox* _log_warning; wxCheckBox* _log_error;