X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=5b7dc1cc41390e5f63406c201857e0b8f5d7ce08;hb=00b60f52add041a36fa62118baf4b5ac78993980;hp=52742f06626fd6f949e14c398243734819799475;hpb=927013227fc25e84191cd41b16cb7653b0d85352;p=dcpomatic.git diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 52742f066..5b7dc1cc4 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,15 +32,16 @@ #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" #include "lib/dcp_content_type.h" #include "lib/log.h" #include "lib/util.h" -#include "lib/raw_convert.h" #include "lib/cross.h" #include "lib/exceptions.h" +#include #include #include #include @@ -61,6 +63,7 @@ using boost::bind; using boost::shared_ptr; using boost::function; using boost::optional; +using dcp::locale_convert; class Page { @@ -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, locale_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,16 @@ 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 ( + locale_convert (string_client_data (_dcp_audio_channels->GetClientObject (s))) + ); + } + } + void directory_changed () { Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ())); @@ -567,6 +588,7 @@ private: #endif wxChoice* _container; wxChoice* _dcp_content_type; + wxChoice* _dcp_audio_channels; wxChoice* _standard; }; @@ -602,7 +624,6 @@ 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) ); @@ -712,7 +733,7 @@ public: ++r; _button_sizer = new wxBoxSizer (wxHORIZONTAL); - _remake_certificates = new wxButton (this, wxID_ANY, _("Re-make certificates and key...")); + _remake_certificates = new wxButton (this, wxID_ANY, _("Re-make certificates\nand key...")); _button_sizer->Add (_remake_certificates, 1, wxRIGHT, border); table->Add (_button_sizer, wxGBPosition (r, 0), wxGBSpan (1, 4)); ++r; @@ -740,7 +761,7 @@ public: void add_button (wxWindow* button) { - _button_sizer->Add (button); + _button_sizer->Add (button, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP); _sizer->Layout (); } @@ -751,8 +772,9 @@ private: if (d->ShowModal() == wxID_OK) { try { - dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ()))); - if (c.extra_data ()) { + dcp::Certificate c; + string const extra = c.read_string (dcp::file_to_string (wx_to_std (d->GetPath ()))); + if (!extra.empty ()) { message_dialog ( this, _("This file contains other certificates (or other data) after its first certificate. " @@ -807,7 +829,7 @@ private: if (d->ShowModal () == wxID_OK) { FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w"); if (!f) { - throw OpenFileError (wx_to_std (d->GetPath ())); + throw OpenFileError (wx_to_std (d->GetPath ()), errno, false); } string const s = j->certificate (true); @@ -955,7 +977,7 @@ private: if (d->ShowModal () == wxID_OK) { FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w"); if (!f) { - throw OpenFileError (wx_to_std (d->GetPath ())); + throw OpenFileError (wx_to_std (d->GetPath ()), errno, false); } string const s = _chain->key().get (); @@ -1019,10 +1041,13 @@ private: _panel->GetSizer()->Add (_decryption); - _export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption certificate...")); + _export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption\ncertificate...")); _decryption->add_button (_export_decryption_certificate); + _export_decryption_chain = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption\nchain...")); + _decryption->add_button (_export_decryption_chain); _export_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_certificate, this)); + _export_decryption_chain->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_chain, this)); } void export_decryption_certificate () @@ -1035,7 +1060,7 @@ private: if (d->ShowModal () == wxID_OK) { FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w"); if (!f) { - throw OpenFileError (wx_to_std (d->GetPath ())); + throw OpenFileError (wx_to_std (d->GetPath ()), errno, false); } string const s = Config::instance()->decryption_chain()->leaf().certificate (true); @@ -1045,6 +1070,26 @@ private: d->Destroy (); } + void export_decryption_chain () + { + wxFileDialog* d = new wxFileDialog ( + _panel, _("Select Chain File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT + ); + + if (d->ShowModal () == wxID_OK) { + FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w"); + if (!f) { + throw OpenFileError (wx_to_std (d->GetPath ()), errno, false); + } + + string const s = Config::instance()->decryption_chain()->chain(); + fwrite (s.c_str(), 1, s.length(), f); + fclose (f); + } + d->Destroy (); + } + void config_changed () { _signer->config_changed (); @@ -1054,6 +1099,7 @@ private: CertificateChainEditor* _signer; CertificateChainEditor* _decryption; wxButton* _export_decryption_certificate; + wxButton* _export_decryption_chain; }; class TMSPage : public StandardPage @@ -1229,7 +1275,6 @@ private: 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); @@ -1356,6 +1401,17 @@ public: {} private: + void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text) + { + int flags = wxALIGN_TOP | wxTOP | wxLEFT; +#ifdef __WXOSX__ + flags |= wxALIGN_RIGHT; + text += wxT (":"); +#endif + wxStaticText* m = new wxStaticText (parent, wxID_ANY, text); + table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); + } + void setup () { wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); @@ -1379,15 +1435,38 @@ private: table->Add (_only_servers_encode, 1, wxEXPAND | wxALL); table->AddSpacer (0); -#ifdef __WXOSX__ - wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:")); - table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6); -#else - wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log")); - table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL, 6); -#endif + { + add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format")); + dcp::NameFormat::Map titles; + titles['t'] = "type (cpl/pkl)"; + dcp::NameFormat::Map examples; + examples['t'] = "cpl"; + _dcp_metadata_filename_format = new NameFormatEditor ( + _panel, Config::instance()->dcp_metadata_filename_format(), titles, examples, "_eb1c112c-ca3c-4ae6-9263-c6714ff05d64.xml" + ); + table->Add (_dcp_metadata_filename_format->panel(), 1, wxEXPAND | wxALL); + } + + { + add_top_aligned_label_to_sizer (table, _panel, _("DCP asset filename format")); + dcp::NameFormat::Map titles; + titles['t'] = "type (j2c/pcm/sub)"; + titles['r'] = "reel number"; + titles['n'] = "number of reels"; + titles['c'] = "content filename"; + dcp::NameFormat::Map examples; + examples['t'] = "j2c"; + examples['r'] = "1"; + examples['n'] = "4"; + examples['c'] = "myfile.mp4"; + _dcp_asset_filename_format = new NameFormatEditor ( + _panel, Config::instance()->dcp_asset_filename_format(), titles, examples, "_eb1c112c-ca3c-4ae6-9263-c6714ff05d64.mxf" + ); + table->Add (_dcp_asset_filename_format->panel(), 1, wxEXPAND | wxALL); + } { + add_top_aligned_label_to_sizer (table, _panel, _("Log")); wxBoxSizer* t = new wxBoxSizer (wxVERTICAL); _log_general = new wxCheckBox (_panel, wxID_ANY, _("General")); t->Add (_log_general, 1, wxEXPAND | wxALL); @@ -1417,6 +1496,8 @@ 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_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this)); + _dcp_asset_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_asset_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)); @@ -1463,6 +1544,16 @@ private: Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ()); } + void dcp_metadata_filename_format_changed () + { + Config::instance()->set_dcp_metadata_filename_format (_dcp_metadata_filename_format->get ()); + } + + void dcp_asset_filename_format_changed () + { + Config::instance()->set_dcp_asset_filename_format (_dcp_asset_filename_format->get ()); + } + void log_changed () { int types = 0; @@ -1500,6 +1591,8 @@ private: wxSpinCtrl* _maximum_j2k_bandwidth; wxCheckBox* _allow_any_dcp_frame_rate; wxCheckBox* _only_servers_encode; + NameFormatEditor* _dcp_metadata_filename_format; + NameFormatEditor* _dcp_asset_filename_format; wxCheckBox* _log_general; wxCheckBox* _log_warning; wxCheckBox* _log_error;