/*
- Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "name_format_editor.h"
#include "nag_dialog.h"
#include "config_move_dialog.h"
+#include "config_dialog.h"
#include "lib/config.h"
#include "lib/ratio.h"
#include "lib/filter.h"
using boost::optional;
using dcp::locale_convert;
-static
-void
-do_nothing ()
-{
-
-}
-
-class Page
-{
-public:
- Page (wxSize panel_size, int border)
- : _border (border)
- , _panel (0)
- , _panel_size (panel_size)
- , _window_exists (false)
- {
- _config_connection = Config::instance()->Changed.connect (boost::bind (&Page::config_changed_wrapper, this));
- }
-
- virtual ~Page () {}
-
-protected:
- wxWindow* create_window (wxWindow* parent)
- {
- _panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
- _panel->SetSizer (s);
-
- setup ();
- _window_exists = true;
- config_changed ();
-
- _panel->Bind (wxEVT_DESTROY, boost::bind (&Page::window_destroyed, this));
-
- return _panel;
- }
-
- int _border;
- wxPanel* _panel;
-
-private:
- virtual void config_changed () = 0;
- virtual void setup () = 0;
-
- void config_changed_wrapper ()
- {
- if (_window_exists) {
- config_changed ();
- }
- }
-
- void window_destroyed ()
- {
- _window_exists = false;
- }
-
- wxSize _panel_size;
- boost::signals2::scoped_connection _config_connection;
- bool _window_exists;
-};
-
-class StockPage : public wxStockPreferencesPage, public Page
-{
-public:
- StockPage (Kind kind, wxSize panel_size, int border)
- : wxStockPreferencesPage (kind)
- , Page (panel_size, border)
- {}
-
- wxWindow* CreateWindow (wxWindow* parent)
- {
- return create_window (parent);
- }
-};
-
-class StandardPage : public wxPreferencesPage, public Page
+class FullGeneralPage : public GeneralPage
{
public:
- StandardPage (wxSize panel_size, int border)
- : Page (panel_size, border)
- {}
-
- wxWindow* CreateWindow (wxWindow* parent)
- {
- return create_window (parent);
- }
-};
-
-class GeneralPage : public StockPage
-{
-public:
- GeneralPage (wxSize panel_size, int border)
- : StockPage (Kind_General, panel_size, border)
+ FullGeneralPage (wxSize panel_size, int border)
+ : GeneralPage (panel_size, border)
{}
private:
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
int r = 0;
- _set_language = new wxCheckBox (_panel, wxID_ANY, _("Set language"));
- table->Add (_set_language, wxGBPosition (r, 0));
- _language = new wxChoice (_panel, wxID_ANY);
- 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;
-
- wxStaticText* restart = add_label_to_sizer (
- table, _panel, _("(restart DCP-o-matic to see language changes)"), false, wxGBPosition (r, 0), wxGBSpan (1, 2)
- );
- wxFont font = restart->GetFont();
- font.SetStyle (wxFONTSTYLE_ITALIC);
- font.SetPointSize (font.GetPointSize() - 1);
- restart->SetFont (font);
- ++r;
+ add_language_controls (table, r);
add_label_to_sizer (table, _panel, _("Number of threads DCP-o-matic should use"), true, wxGBPosition (r, 0));
_master_encoding_threads = new wxSpinCtrl (_panel);
table->Add (_cinemas_file, wxGBPosition (r, 1));
++r;
- _preview_sound = new wxCheckBox (_panel, wxID_ANY, _("Play sound in the preview via"));
- table->Add (_preview_sound, wxGBPosition (r, 0));
- _preview_sound_output = new wxChoice (_panel, wxID_ANY);
- table->Add (_preview_sound_output, wxGBPosition (r, 1));
- ++r;
+ add_play_sound_controls (table, 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 (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- _check_for_updates = new wxCheckBox (_panel, wxID_ANY, _("Check for updates on startup"));
- table->Add (_check_for_updates, wxGBPosition (r, 0), wxGBSpan (1, 2));
- ++r;
-
- _check_for_test_updates = new wxCheckBox (_panel, wxID_ANY, _("Check for testing updates on startup"));
- table->Add (_check_for_test_updates, wxGBPosition (r, 0), wxGBSpan (1, 2));
- ++r;
+ add_update_controls (table, r);
wxFlexGridSizer* bottom_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
bottom_table->AddGrowableCol (1, 1);
table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
++r;
- RtAudio audio (DCPOMATIC_RTAUDIO_API);
- for (unsigned int i = 0; i < audio.getDeviceCount(); ++i) {
- RtAudio::DeviceInfo dev = audio.getDeviceInfo (i);
- if (dev.probed && dev.outputChannels > 0) {
- _preview_sound_output->Append (std_to_wx (dev.name));
- }
- }
-
- _set_language->Bind (wxEVT_CHECKBOX, boost::bind (&GeneralPage::set_language_changed, this));
- _language->Bind (wxEVT_CHOICE, boost::bind (&GeneralPage::language_changed, this));
- _config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&GeneralPage::config_file_changed, this));
- _cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&GeneralPage::cinemas_file_changed, this));
- _preview_sound->Bind (wxEVT_CHECKBOX, boost::bind (&GeneralPage::preview_sound_changed, this));
- _preview_sound_output->Bind (wxEVT_CHOICE, boost::bind (&GeneralPage::preview_sound_output_changed, this));
+ _config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed, this));
+ _cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed, this));
_master_encoding_threads->SetRange (1, 128);
- _master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&GeneralPage::master_encoding_threads_changed, this));
+ _master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this));
_server_encoding_threads->SetRange (1, 128);
- _server_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&GeneralPage::server_encoding_threads_changed, this));
+ _server_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::server_encoding_threads_changed, this));
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
- _analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&GeneralPage::analyse_ebur128_changed, this));
+ _analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
#endif
- _automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&GeneralPage::automatic_audio_analysis_changed, this));
- _check_for_updates->Bind (wxEVT_CHECKBOX, boost::bind (&GeneralPage::check_for_updates_changed, this));
- _check_for_test_updates->Bind (wxEVT_CHECKBOX, boost::bind (&GeneralPage::check_for_test_updates_changed, this));
+ _automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
- _issuer->Bind (wxEVT_TEXT, boost::bind (&GeneralPage::issuer_changed, this));
- _creator->Bind (wxEVT_TEXT, boost::bind (&GeneralPage::creator_changed, this));
+ _issuer->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::issuer_changed, this));
+ _creator->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::creator_changed, this));
}
void config_changed ()
{
Config* config = Config::instance ();
- checked_set (_set_language, static_cast<bool>(config->language()));
-
- /* 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 (_master_encoding_threads, config->master_encoding_threads ());
checked_set (_server_encoding_threads, config->server_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 ());
checked_set (_issuer, config->dcp_issuer ());
checked_set (_creator, config->dcp_creator ());
checked_set (_config_file, config->config_file());
checked_set (_cinemas_file, config->cinemas_file());
- checked_set (_preview_sound, config->preview_sound());
-
- optional<string> const current_so = get_preview_sound_output ();
- optional<string> configured_so;
-
- if (config->preview_sound_output()) {
- configured_so = config->preview_sound_output().get();
- } else {
- /* No configured output means we should use the default */
- RtAudio audio (DCPOMATIC_RTAUDIO_API);
- try {
- configured_so = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
- } catch (RtAudioError& e) {
- /* Probably no audio devices at all */
- }
- }
-
- if (configured_so && current_so != configured_so) {
- /* Update _preview_sound_output with the configured value */
- unsigned int i = 0;
- while (i < _preview_sound_output->GetCount()) {
- if (_preview_sound_output->GetString(i) == std_to_wx(*configured_so)) {
- _preview_sound_output->SetSelection (i);
- break;
- }
- ++i;
- }
- }
- setup_sensitivity ();
+ GeneralPage::config_changed ();
}
- /** @return Currently-selected preview sound output in the dialogue */
- optional<string> get_preview_sound_output ()
- {
- int const sel = _preview_sound_output->GetSelection ();
- if (sel == wxNOT_FOUND) {
- return optional<string> ();
- }
-
- return wx_to_std (_preview_sound_output->GetString (sel));
- }
-
- void setup_sensitivity ()
- {
- _language->Enable (_set_language->GetValue ());
- _check_for_test_updates->Enable (_check_for_updates->GetValue ());
- _preview_sound_output->Enable (_preview_sound->GetValue ());
- }
-
- void set_language_changed ()
- {
- setup_sensitivity ();
- if (_set_language->GetValue ()) {
- language_changed ();
- } else {
- Config::instance()->unset_language ();
- }
- }
-
- void language_changed ()
- {
- 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_automatic_audio_analysis (_automatic_audio_analysis->GetValue ());
}
- void check_for_updates_changed ()
- {
- Config::instance()->set_check_for_updates (_check_for_updates->GetValue ());
- }
-
- void check_for_test_updates_changed ()
- {
- Config::instance()->set_check_for_test_updates (_check_for_test_updates->GetValue ());
- }
-
void master_encoding_threads_changed ()
{
Config::instance()->set_master_encoding_threads (_master_encoding_threads->GetValue ());
Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
}
- void preview_sound_changed ()
- {
- Config::instance()->set_preview_sound (_preview_sound->GetValue ());
- }
-
- void preview_sound_output_changed ()
- {
- RtAudio audio (DCPOMATIC_RTAUDIO_API);
- optional<string> const so = get_preview_sound_output();
- if (!so || *so == audio.getDeviceInfo(audio.getDefaultOutputDevice()).name) {
- Config::instance()->unset_preview_sound_output ();
- } else {
- Config::instance()->set_preview_sound_output (*so);
- }
- }
-
- wxCheckBox* _set_language;
- wxChoice* _language;
wxSpinCtrl* _master_encoding_threads;
wxSpinCtrl* _server_encoding_threads;
FilePickerCtrl* _config_file;
FilePickerCtrl* _cinemas_file;
- wxCheckBox* _preview_sound;
- wxChoice* _preview_sound_output;
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
wxCheckBox* _analyse_ebur128;
#endif
wxCheckBox* _automatic_audio_analysis;
- wxCheckBox* _check_for_updates;
- wxCheckBox* _check_for_test_updates;
wxTextCtrl* _issuer;
wxTextCtrl* _creator;
};
#else
_kdm_directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST);
#endif
+
table->Add (_kdm_directory, 1, wxEXPAND);
+ _upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Default to enabling upload of DCP to TMS"));
+ table->Add (_upload_after_make_dcp, 1, wxEXPAND);
+
_still_length->SetRange (1, 3600);
_still_length->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::still_length_changed, this));
_standard->Append (_("SMPTE"));
_standard->Append (_("Interop"));
_standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this));
+
+ _upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DefaultsPage::upload_after_make_dcp_changed, this));
}
void config_changed ()
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);
+ checked_set (_upload_after_make_dcp, config->default_upload_after_make_dcp());
}
void j2k_bandwidth_changed ()
Config::instance()->set_default_interop (_standard->GetSelection() == 1);
}
+ void upload_after_make_dcp_changed ()
+ {
+ Config::instance()->set_default_upload_after_make_dcp (_upload_after_make_dcp->GetValue ());
+ }
+
wxSpinCtrl* _j2k_bandwidth;
wxSpinCtrl* _audio_delay;
wxButton* _isdcf_metadata_button;
wxChoice* _dcp_content_type;
wxChoice* _dcp_audio_channels;
wxChoice* _standard;
+ wxCheckBox* _upload_after_make_dcp;
};
class EncodingServersPage : public StandardPage
EditableList<string, ServerDialog>* _servers_list;
};
-class CertificateChainEditor : public wxPanel
-{
-public:
- CertificateChainEditor (
- wxWindow* parent,
- wxString title,
- int border,
- function<void (shared_ptr<dcp::CertificateChain>)> set,
- function<shared_ptr<const dcp::CertificateChain> (void)> get,
- function<void (void)> nag_remake
- )
- : wxPanel (parent)
- , _set (set)
- , _get (get)
- , _nag_remake (nag_remake)
- {
- wxFont subheading_font (*wxNORMAL_FONT);
- subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
-
- _sizer = new wxBoxSizer (wxVERTICAL);
-
- {
- wxStaticText* m = new wxStaticText (this, wxID_ANY, title);
- m->SetFont (subheading_font);
- _sizer->Add (m, 0, wxALL, border);
- }
-
- wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
- _sizer->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, border);
-
- _certificates = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (440, 150), wxLC_REPORT | wxLC_SINGLE_SEL);
-
- {
- wxListItem ip;
- ip.SetId (0);
- ip.SetText (_("Type"));
- ip.SetWidth (100);
- _certificates->InsertColumn (0, ip);
- }
-
- {
- wxListItem ip;
- ip.SetId (1);
- ip.SetText (_("Thumbprint"));
- ip.SetWidth (340);
-
- wxFont font = ip.GetFont ();
- font.SetFamily (wxFONTFAMILY_TELETYPE);
- ip.SetFont (font);
-
- _certificates->InsertColumn (1, ip);
- }
-
- certificates_sizer->Add (_certificates, 1, wxEXPAND);
-
- {
- wxSizer* s = new wxBoxSizer (wxVERTICAL);
- _add_certificate = new wxButton (this, wxID_ANY, _("Add..."));
- s->Add (_add_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
- _remove_certificate = new wxButton (this, wxID_ANY, _("Remove"));
- s->Add (_remove_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
- _export_certificate = new wxButton (this, wxID_ANY, _("Export"));
- s->Add (_export_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
- certificates_sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
- }
-
- wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- _sizer->Add (table, 1, wxALL | wxEXPAND, border);
- int r = 0;
-
- add_label_to_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0));
- _private_key = new wxStaticText (this, wxID_ANY, wxT (""));
- wxFont font = _private_key->GetFont ();
- font.SetFamily (wxFONTFAMILY_TELETYPE);
- _private_key->SetFont (font);
- table->Add (_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _load_private_key = new wxButton (this, wxID_ANY, _("Load..."));
- table->Add (_load_private_key, wxGBPosition (r, 2));
- _export_private_key = new wxButton (this, wxID_ANY, _("Export..."));
- table->Add (_export_private_key, wxGBPosition (r, 3));
- ++r;
-
- _button_sizer = new wxBoxSizer (wxHORIZONTAL);
- _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;
-
- _private_key_bad = new wxStaticText (this, wxID_ANY, _("Leaf private key does not match leaf certificate!"));
- font = *wxSMALL_FONT;
- font.SetWeight (wxFONTWEIGHT_BOLD);
- _private_key_bad->SetFont (font);
- table->Add (_private_key_bad, wxGBPosition (r, 0), wxGBSpan (1, 3));
- ++r;
-
- _add_certificate->Bind (wxEVT_BUTTON, boost::bind (&CertificateChainEditor::add_certificate, this));
- _remove_certificate->Bind (wxEVT_BUTTON, boost::bind (&CertificateChainEditor::remove_certificate, this));
- _export_certificate->Bind (wxEVT_BUTTON, boost::bind (&CertificateChainEditor::export_certificate, this));
- _certificates->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&CertificateChainEditor::update_sensitivity, this));
- _certificates->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&CertificateChainEditor::update_sensitivity, this));
- _remake_certificates->Bind (wxEVT_BUTTON, boost::bind (&CertificateChainEditor::remake_certificates, this));
- _load_private_key->Bind (wxEVT_BUTTON, boost::bind (&CertificateChainEditor::load_private_key, this));
- _export_private_key->Bind (wxEVT_BUTTON, boost::bind (&CertificateChainEditor::export_private_key, this));
-
- SetSizerAndFit (_sizer);
- }
-
- void config_changed ()
- {
- _chain.reset (new dcp::CertificateChain (*_get().get ()));
-
- update_certificate_list ();
- update_private_key ();
- update_sensitivity ();
- }
-
- void add_button (wxWindow* button)
- {
- _button_sizer->Add (button, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
- _sizer->Layout ();
- }
-
-private:
- void add_certificate ()
- {
- wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
-
- if (d->ShowModal() == wxID_OK) {
- try {
- dcp::Certificate c;
- string extra;
- try {
- extra = c.read_string (dcp::file_to_string (wx_to_std (d->GetPath ())));
- } catch (boost::filesystem::filesystem_error& e) {
- error_dialog (this, wxString::Format (_("Could not load certificate (%s)"), d->GetPath().data()));
- d->Destroy ();
- return;
- }
-
- 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);
- if (!_chain->chain_valid ()) {
- error_dialog (
- this,
- _("Adding this certificate would make the chain inconsistent, so it will not be added. "
- "Add certificates in order from root to intermediate to leaf.")
- );
- _chain->remove (c);
- } else {
- _set (_chain);
- update_certificate_list ();
- }
- } catch (dcp::MiscError& e) {
- error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
- }
- }
-
- d->Destroy ();
-
- update_sensitivity ();
- }
-
- void remove_certificate ()
- {
- int i = _certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (i == -1) {
- return;
- }
-
- _certificates->DeleteItem (i);
- _chain->remove (i);
- _set (_chain);
-
- update_sensitivity ();
- }
-
- void export_certificate ()
- {
- int i = _certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (i == -1) {
- return;
- }
-
- wxFileDialog* d = new wxFileDialog (
- this, _("Select Certificate File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"),
- wxFD_SAVE | wxFD_OVERWRITE_PROMPT
- );
-
- dcp::CertificateChain::List all = _chain->root_to_leaf ();
- dcp::CertificateChain::List::iterator j = all.begin ();
- for (int k = 0; k < i; ++k) {
- ++j;
- }
-
- 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 = j->certificate (true);
- fwrite (s.c_str(), 1, s.length(), f);
- fclose (f);
- }
- d->Destroy ();
- }
-
- void update_certificate_list ()
- {
- _certificates->DeleteAllItems ();
- size_t n = 0;
- dcp::CertificateChain::List certs = _chain->root_to_leaf ();
- BOOST_FOREACH (dcp::Certificate const & i, certs) {
- wxListItem item;
- item.SetId (n);
- _certificates->InsertItem (item);
- _certificates->SetItem (n, 1, std_to_wx (i.thumbprint ()));
-
- if (n == 0) {
- _certificates->SetItem (n, 0, _("Root"));
- } else if (n == (certs.size() - 1)) {
- _certificates->SetItem (n, 0, _("Leaf"));
- } else {
- _certificates->SetItem (n, 0, _("Intermediate"));
- }
-
- ++n;
- }
-
- static wxColour normal = _private_key_bad->GetForegroundColour ();
-
- if (_chain->private_key_valid ()) {
- _private_key_bad->Hide ();
- _private_key_bad->SetForegroundColour (normal);
- } else {
- _private_key_bad->Show ();
- _private_key_bad->SetForegroundColour (wxColour (255, 0, 0));
- }
- }
-
- void remake_certificates ()
- {
- shared_ptr<const dcp::CertificateChain> chain = _get ();
-
- string subject_organization_name;
- string subject_organizational_unit_name;
- string root_common_name;
- string intermediate_common_name;
- string leaf_common_name;
-
- dcp::CertificateChain::List all = chain->root_to_leaf ();
-
- if (all.size() >= 1) {
- /* Have a root */
- subject_organization_name = chain->root().subject_organization_name ();
- subject_organizational_unit_name = chain->root().subject_organizational_unit_name ();
- root_common_name = chain->root().subject_common_name ();
- }
-
- if (all.size() >= 2) {
- /* Have a leaf */
- leaf_common_name = chain->leaf().subject_common_name ();
- }
-
- if (all.size() >= 3) {
- /* Have an intermediate */
- dcp::CertificateChain::List::iterator i = all.begin ();
- ++i;
- intermediate_common_name = i->subject_common_name ();
- }
-
- _nag_remake ();
-
- MakeChainDialog* d = new MakeChainDialog (
- this,
- subject_organization_name,
- subject_organizational_unit_name,
- root_common_name,
- intermediate_common_name,
- leaf_common_name
- );
-
- if (d->ShowModal () == wxID_OK) {
- _chain.reset (
- new dcp::CertificateChain (
- openssl_path (),
- d->organisation (),
- d->organisational_unit (),
- d->root_common_name (),
- d->intermediate_common_name (),
- d->leaf_common_name ()
- )
- );
-
- _set (_chain);
- update_certificate_list ();
- update_private_key ();
- }
-
- d->Destroy ();
- }
-
- void update_sensitivity ()
- {
- /* We can only remove the leaf certificate */
- _remove_certificate->Enable (_certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) == (_certificates->GetItemCount() - 1));
- _export_certificate->Enable (_certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1);
- }
-
- void update_private_key ()
- {
- checked_set (_private_key, dcp::private_key_fingerprint (_chain->key().get ()));
- _sizer->Layout ();
- }
-
- void load_private_key ()
- {
- wxFileDialog* d = new wxFileDialog (this, _("Select Key File"));
-
- if (d->ShowModal() == wxID_OK) {
- try {
- boost::filesystem::path p (wx_to_std (d->GetPath ()));
- 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;
- }
-
- _chain->set_key (dcp::file_to_string (p));
- _set (_chain);
- update_private_key ();
- } catch (dcp::MiscError& e) {
- error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
- }
- }
-
- d->Destroy ();
-
- update_sensitivity ();
- }
-
- void export_private_key ()
- {
- optional<string> key = _chain->key ();
- if (!key) {
- return;
- }
-
- wxFileDialog* d = new wxFileDialog (
- this, _("Select Key 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 = _chain->key().get ();
- fwrite (s.c_str(), 1, s.length(), f);
- fclose (f);
- }
- d->Destroy ();
- }
-
- wxListCtrl* _certificates;
- wxButton* _add_certificate;
- wxButton* _export_certificate;
- wxButton* _remove_certificate;
- wxButton* _remake_certificates;
- wxStaticText* _private_key;
- wxButton* _load_private_key;
- wxButton* _export_private_key;
- wxStaticText* _private_key_bad;
- wxSizer* _sizer;
- wxBoxSizer* _button_sizer;
- shared_ptr<dcp::CertificateChain> _chain;
- boost::function<void (shared_ptr<dcp::CertificateChain>)> _set;
- boost::function<shared_ptr<const dcp::CertificateChain> (void)> _get;
- boost::function<void (void)> _nag_remake;
-};
-
-class KeysPage : public StandardPage
-{
-public:
- KeysPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
- {}
-
- wxString GetName () const
- {
- return _("Keys");
- }
-
-#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
- {
- return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
- }
-#endif
-
-private:
-
- void setup ()
- {
- _signer = new CertificateChainEditor (
- _panel, _("Signing DCPs and KDMs"), _border,
- boost::bind (&Config::set_signer_chain, Config::instance (), _1),
- boost::bind (&Config::signer_chain, Config::instance ()),
- boost::bind (&do_nothing)
- );
-
- _panel->GetSizer()->Add (_signer);
-
- _decryption = new CertificateChainEditor (
- _panel, _("Decrypting KDMs"), _border,
- boost::bind (&Config::set_decryption_chain, Config::instance (), _1),
- boost::bind (&Config::decryption_chain, Config::instance ()),
- boost::bind (&KeysPage::nag_remake_decryption_chain, this)
- );
-
- _panel->GetSizer()->Add (_decryption);
-
- _export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export KDM decryption\ncertificate..."));
- _decryption->add_button (_export_decryption_certificate);
- _export_decryption_chain = new wxButton (_decryption, wxID_ANY, _("Export KDM decryption\nchain..."));
- _decryption->add_button (_export_decryption_chain);
-
- _export_decryption_certificate->Bind (wxEVT_BUTTON, boost::bind (&KeysPage::export_decryption_certificate, this));
- _export_decryption_chain->Bind (wxEVT_BUTTON, boost::bind (&KeysPage::export_decryption_chain, this));
- }
-
- void export_decryption_certificate ()
- {
- wxFileDialog* d = new wxFileDialog (
- _panel, _("Select Certificate 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()->leaf().certificate (true);
- fwrite (s.c_str(), 1, s.length(), f);
- fclose (f);
- }
- 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 ();
- _decryption->config_changed ();
- }
-
- void nag_remake_decryption_chain ()
- {
- NagDialog::maybe_nag (
- _panel,
- Config::NAG_REMAKE_DECRYPTION_CHAIN,
- _("If you continue with this operation you will no longer be able to use any DKDMs that you have created. Also, any KDMs that have been sent to you will become useless. Proceed with caution!")
- );
- }
-
- CertificateChainEditor* _signer;
- CertificateChainEditor* _decryption;
- wxButton* _export_decryption_certificate;
- wxButton* _export_decryption_chain;
-};
-
class TMSPage : public StandardPage
{
public:
table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
+ {
+ add_label_to_sizer (table, _panel, _("Maximum number of frames to store per thread"), true);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _frames_in_memory_multiplier = new wxSpinCtrl (_panel);
+ s->Add (_frames_in_memory_multiplier, 1);
+ table->Add (s, 1);
+ }
+
{
add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format"));
dcp::NameFormat::Map titles;
_maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
_allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
_only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
+ _frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_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_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
checked_set (_log_debug_decode, config->log_types() & LogEntry::TYPE_DEBUG_DECODE);
checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL);
+ checked_set (_frames_in_memory_multiplier, config->frames_in_memory_multiplier());
#ifdef DCPOMATIC_WINDOWS
checked_set (_win32_console, config->win32_console());
#endif
Config::instance()->set_maximum_j2k_bandwidth (_maximum_j2k_bandwidth->GetValue() * 1000000);
}
+ void frames_in_memory_multiplier_changed ()
+ {
+ Config::instance()->set_frames_in_memory_multiplier (_frames_in_memory_multiplier->GetValue());
+ }
+
void allow_any_dcp_frame_rate_changed ()
{
Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ());
#endif
wxSpinCtrl* _maximum_j2k_bandwidth;
+ wxSpinCtrl* _frames_in_memory_multiplier;
wxCheckBox* _allow_any_dcp_frame_rate;
wxCheckBox* _only_servers_encode;
NameFormatEditor* _dcp_metadata_filename_format;
int const border = 8;
#endif
- e->AddPage (new GeneralPage (ps, border));
+ e->AddPage (new FullGeneralPage (ps, border));
e->AddPage (new DefaultsPage (ps, border));
e->AddPage (new EncodingServersPage (ps, border));
- e->AddPage (new KeysPage (ps, border));
+ e->AddPage (new KeysPage (ps, border, true));
e->AddPage (new TMSPage (ps, border));
e->AddPage (new KDMEmailPage (ps, border));
e->AddPage (new CoverSheetPage (ps, border));
projects / dcpomatic.git / blobdiff