X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=e44ed879bbcd6895b527abc11c813d6a1c7f2e74;hb=ee37079f77166aaa309ffe7b3475b4f79f88eaa8;hp=696f7a65fc9beceefa29c7d33962fa43c37d81d7;hpb=4228cb5b5323e9dc4bc87182b27427e48bb59d91;p=dcpomatic.git diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 696f7a65f..e44ed879b 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 . */ @@ -46,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -55,9 +55,11 @@ using std::vector; using std::string; using std::list; using std::cout; +using std::pair; +using std::make_pair; +using std::map; using boost::bind; using boost::shared_ptr; -using boost::lexical_cast; using boost::function; using boost::optional; @@ -159,19 +161,24 @@ private: _set_language = new wxCheckBox (_panel, wxID_ANY, _("Set language")); table->Add (_set_language, wxGBPosition (r, 0)); _language = new wxChoice (_panel, wxID_ANY); - _language->Append (wxT ("Deutsch")); - _language->Append (wxT ("English")); - _language->Append (wxT ("Español")); - _language->Append (wxT ("Français")); - _language->Append (wxT ("Italiano")); - _language->Append (wxT ("Nederlands")); - _language->Append (wxT ("Svenska")); - _language->Append (wxT ("Русский")); - _language->Append (wxT ("Polski")); - _language->Append (wxT ("Dansk")); - _language->Append (wxT ("Português europeu")); - _language->Append (wxT ("Slovenský jazyk")); - _language->Append (wxT ("Čeština")); + vector > languages; + languages.push_back (make_pair ("Čeština", "cs_CZ")); + languages.push_back (make_pair ("汉语/漢語", "zh_CN")); + languages.push_back (make_pair ("Dansk", "da_DK")); + languages.push_back (make_pair ("Deutsch", "de_DE")); + languages.push_back (make_pair ("English", "en_GB")); + languages.push_back (make_pair ("Español", "es_ES")); + languages.push_back (make_pair ("Français", "fr_FR")); + languages.push_back (make_pair ("Italiano", "it_IT")); + languages.push_back (make_pair ("Nederlands", "nl_NL")); + languages.push_back (make_pair ("Русский", "ru_RU")); + languages.push_back (make_pair ("Polski", "pl_PL")); + languages.push_back (make_pair ("Português europeu", "pt_PT")); + languages.push_back (make_pair ("Português do Brasil", "pt_BR")); + languages.push_back (make_pair ("Svenska", "sv_SE")); + languages.push_back (make_pair ("Slovenský jazyk", "sk_SK")); + languages.push_back (make_pair ("українська мова", "uk_UA")); + checked_set (_language, languages); table->Add (_language, wxGBPosition (r, 1)); ++r; @@ -194,6 +201,12 @@ private: table->Add (_cinemas_file, wxGBPosition (r, 1)); ++r; +#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; +#endif + _automatic_audio_analysis = new wxCheckBox (_panel, wxID_ANY, _("Automatically analyse content audio")); table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -227,6 +240,9 @@ 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_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)); _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this)); _check_for_test_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_test_updates_changed, this)); @@ -241,35 +257,34 @@ private: checked_set (_set_language, static_cast(config->language())); - if (config->language().get_value_or ("") == "fr") { - checked_set (_language, 3); - } else if (config->language().get_value_or ("") == "it") { - checked_set (_language, 4); - } else if (config->language().get_value_or ("") == "es") { - checked_set (_language, 2); - } else if (config->language().get_value_or ("") == "sv") { - checked_set (_language, 6); - } else if (config->language().get_value_or ("") == "de") { - checked_set (_language, 0); - } else if (config->language().get_value_or ("") == "nl") { - checked_set (_language, 5); - } else if (config->language().get_value_or ("") == "ru") { - checked_set (_language, 7); - } else if (config->language().get_value_or ("") == "pl") { - checked_set (_language, 8); - } else if (config->language().get_value_or ("") == "da") { - checked_set (_language, 9); - } else if (config->language().get_value_or ("") == "pt") { - checked_set (_language, 10); - } else if (config->language().get_value_or ("") == "sk") { - checked_set (_language, 11); - } else if (config->language().get_value_or ("") == "cs") { - checked_set (_language, 12); - } else { - _language->SetSelection (1); + /* Backwards compatibility of config file */ + + map compat_map; + compat_map["fr"] = "fr_FR"; + compat_map["it"] = "it_IT"; + compat_map["es"] = "es_ES"; + compat_map["sv"] = "sv_SE"; + compat_map["de"] = "de_DE"; + compat_map["nl"] = "nl_NL"; + compat_map["ru"] = "ru_RU"; + compat_map["pl"] = "pl_PL"; + compat_map["da"] = "da_DK"; + compat_map["pt"] = "pt_PT"; + compat_map["sk"] = "sk_SK"; + compat_map["cs"] = "cs_CZ"; + compat_map["uk"] = "uk_UA"; + + string lang = config->language().get_value_or ("en_GB"); + if (compat_map.find (lang) != compat_map.end ()) { + lang = compat_map[lang]; } + checked_set (_language, lang); + checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ()); +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG + checked_set (_analyse_ebur128, config->analyse_ebur128 ()); +#endif checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ()); checked_set (_check_for_updates, config->check_for_updates ()); checked_set (_check_for_test_updates, config->check_for_test_updates ()); @@ -298,49 +313,21 @@ private: void language_changed () { - switch (_language->GetSelection ()) { - case 0: - Config::instance()->set_language ("de"); - break; - case 1: - Config::instance()->set_language ("en"); - break; - case 2: - Config::instance()->set_language ("es"); - break; - case 3: - Config::instance()->set_language ("fr"); - break; - case 4: - Config::instance()->set_language ("it"); - break; - case 5: - Config::instance()->set_language ("nl"); - break; - case 6: - Config::instance()->set_language ("sv"); - break; - case 7: - Config::instance()->set_language ("ru"); - break; - case 8: - Config::instance()->set_language ("pl"); - break; - case 9: - Config::instance()->set_language ("da"); - break; - case 10: - Config::instance()->set_language ("pt"); - break; - case 11: - Config::instance()->set_language ("sk"); - break; - case 12: - Config::instance()->set_language ("cs"); - break; + int const sel = _language->GetSelection (); + if (sel != -1) { + Config::instance()->set_language (string_client_data (_language->GetClientObject (sel))); + } else { + Config::instance()->unset_language (); } } +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG + void analyse_ebur128_changed () + { + Config::instance()->set_analyse_ebur128 (_analyse_ebur128->GetValue ()); + } +#endif + void automatic_audio_analysis_changed () { Config::instance()->set_automatic_audio_analysis (_automatic_audio_analysis->GetValue ()); @@ -380,6 +367,9 @@ private: wxChoice* _language; wxSpinCtrl* _num_local_encoding_threads; FilePickerCtrl* _cinemas_file; +#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG + wxCheckBox* _analyse_ebur128; +#endif wxCheckBox* _automatic_audio_analysis; wxCheckBox* _check_for_updates; wxCheckBox* _check_for_test_updates; @@ -442,6 +432,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); @@ -483,7 +477,15 @@ private: _dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ())); } + vector > items; + for (int i = 0; i <= 16; i += 2) { + items.push_back (make_pair (raw_convert (i), raw_convert (i))); + } + + checked_set (_dcp_audio_channels, items); + _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)); @@ -518,6 +520,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); } @@ -532,6 +535,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 (s * 2); + } + } + void directory_changed () { Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ())); @@ -578,6 +589,7 @@ private: #endif wxChoice* _container; wxChoice* _dcp_content_type; + wxChoice* _dcp_audio_channels; wxChoice* _standard; }; @@ -613,6 +625,7 @@ private: columns, boost::bind (&Config::servers, Config::instance()), boost::bind (&Config::set_servers, Config::instance(), _1), + boost::bind (&always_valid), boost::bind (&EncodingServersPage::server_column, this, _1) ); @@ -762,6 +775,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 (); @@ -922,8 +942,11 @@ private: if (d->ShowModal() == wxID_OK) { try { boost::filesystem::path p (wx_to_std (d->GetPath ())); - if (boost::filesystem::file_size (p) > 1024) { - error_dialog (this, wxString::Format (_("Could not read key file (%s)"), std_to_wx (p.string ()))); + if (boost::filesystem::file_size (p) > 8192) { + error_dialog ( + this, + wxString::Format (_("Could not read key file; file is too long (%s)"), std_to_wx (p.string ())) + ); return; } @@ -1225,7 +1248,12 @@ private: columns.push_back (wx_to_std (_("Address"))); add_label_to_sizer (table, _panel, _("CC addresses"), true); _kdm_cc = new EditableList ( - _panel, columns, bind (&Config::kdm_cc, Config::instance()), bind (&Config::set_kdm_cc, Config::instance(), _1), bind (&column, _1) + _panel, + columns, + bind (&Config::kdm_cc, Config::instance()), + bind (&Config::set_kdm_cc, Config::instance(), _1), + bind (&string_not_empty, _1), + bind (&column, _1) ); table->Add (_kdm_cc, 1, wxEXPAND | wxALL); @@ -1239,6 +1267,8 @@ private: _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text")); _panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); + _kdm_cc->layout (); + _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this)); _mail_port->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&KDMEmailPage::mail_port_changed, this)); _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this)); @@ -1388,6 +1418,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"));