/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#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 <dcp/locale_convert.h>
#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
#include <wx/stdpaths.h>
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::function;
using boost::optional;
+using dcp::locale_convert;
class Page
{
_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"));
- _language->Append (wxT ("українська мова"));
+ vector<pair<string, string> > 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;
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;
_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));
checked_set (_set_language, static_cast<bool>(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 if (config->language().get_value_or ("") == "uk") {
- checked_set (_language, 13);
- } else {
- _language->SetSelection (1);
+ /* Backwards compatibility of config file */
+
+ map<string, string> 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_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 ());
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;
- case 13:
- Config::instance()->set_language ("uk");
- 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_PATCHED_FFMPEG
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
void analyse_ebur128_changed ()
{
Config::instance()->set_analyse_ebur128 (_analyse_ebur128->GetValue ());
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;
_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);
_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));
_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<string> (config->default_dcp_audio_channels()));
checked_set (_audio_delay, config->default_audio_delay ());
checked_set (_standard, config->default_interop() ? 1 : 0);
}
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<int> (string_client_data (_dcp_audio_channels->GetClientObject (s)))
+ );
+ }
+ }
+
void directory_changed ()
{
Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
#endif
wxChoice* _container;
wxChoice* _dcp_content_type;
+ wxChoice* _dcp_audio_channels;
wxChoice* _standard;
};
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)
);
++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;
void add_button (wxWindow* button)
{
- _button_sizer->Add (button);
+ _button_sizer->Add (button, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
_sizer->Layout ();
}
if (d->ShowModal() == wxID_OK) {
try {
- dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
+ 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. "
+ "Only the first certificate will be used.")
+ );
+ }
_chain->add (c);
_set (_chain);
update_certificate_list ();
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);
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;
}
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 ();
_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 ()
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);
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 ();
CertificateChainEditor* _signer;
CertificateChainEditor* _decryption;
wxButton* _export_decryption_certificate;
+ wxButton* _export_decryption_chain;
};
class TMSPage : public StandardPage
columns.push_back (wx_to_std (_("Address")));
add_label_to_sizer (table, _panel, _("CC addresses"), true);
_kdm_cc = new EditableList<string, EmailDialog> (
- _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);
{}
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);
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);
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"));
_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));
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;
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;
projects / dcpomatic.git / blobdiff