#include "editable_list.h"
#include "filter_dialog.h"
#include "dir_picker_ctrl.h"
+#include "file_picker_ctrl.h"
#include "isdcf_metadata_dialog.h"
#include "server_dialog.h"
#include "make_chain_dialog.h"
#include "lib/raw_convert.h"
#include "lib/cross.h"
#include "lib/exceptions.h"
+#include "lib/jpeg2000_encoder.h"
#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
#include <wx/stdpaths.h>
#include <wx/preferences.h>
-#include <wx/filepicker.h>
#include <wx/spinctrl.h>
-#include <boost/lexical_cast.hpp>
+#include <wx/filepicker.h>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
#include <iostream>
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;
_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"));
+ 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 (_num_local_encoding_threads, wxGBPosition (r, 1));
++r;
+ add_label_to_sizer (table, _panel, _("Cinema and screen database file"), true, wxGBPosition (r, 0));
+ _cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml");
+ table->Add (_cinemas_file, wxGBPosition (r, 1));
+ ++r;
+
+#ifdef DCPOMATIC_HAVE_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;
table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
++r;
+ add_label_to_sizer (table, _panel, _("JPEG2000 encoder"), true, wxGBPosition (r, 0));
+ _encoder = new wxChoice (_panel, wxID_ANY);
+ BOOST_FOREACH (shared_ptr<JPEG2000Encoder> i, JPEG2000Encoder::all()) {
+ _encoder->Append (std_to_wx (i->name ()));
+ }
+ table->Add (_encoder, wxGBPosition (r, 1));
+ ++r;
+
_set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::set_language_changed, this));
_language->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&GeneralPage::language_changed, this));
+ _cinemas_file->Bind (wxEVT_COMMAND_FILEPICKER_CHANGED, boost::bind (&GeneralPage::cinemas_file_changed, this));
_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
+ _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));
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 {
- _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
+ 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 ());
checked_set (_issuer, config->dcp_issuer ());
checked_set (_creator, config->dcp_creator ());
+ checked_set (_cinemas_file, config->cinemas_file());
setup_sensitivity ();
+
+ if (!config->encoder ()) {
+ checked_set (_encoder, 0);
+ } else {
+ vector<shared_ptr<JPEG2000Encoder> > encoders = JPEG2000Encoder::all ();
+ for (size_t i = 0; i < encoders.size(); ++i) {
+ if (encoders[i]->id() == config->encoder().get ()) {
+ checked_set (_encoder, i);
+ }
+ }
+ }
}
void setup_sensitivity ()
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;
+ 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
+ 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 ());
Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
}
+ void cinemas_file_changed ()
+ {
+ Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
+ }
+
wxCheckBox* _set_language;
wxChoice* _language;
wxSpinCtrl* _num_local_encoding_threads;
+ FilePickerCtrl* _cinemas_file;
+#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG
+ wxCheckBox* _analyse_ebur128;
+#endif
wxCheckBox* _automatic_audio_analysis;
wxCheckBox* _check_for_updates;
wxCheckBox* _check_for_test_updates;
wxTextCtrl* _issuer;
wxTextCtrl* _creator;
+ wxChoice* _encoder;
};
class DefaultsPage : public StandardPage
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)
);
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);
_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));
projects / dcpomatic.git / blobdiff