/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "nag_dialog.h"
#include "config_move_dialog.h"
#include "config_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
+#include "password_entry.h"
#include "lib/config.h"
#include "lib/ratio.h"
#include "lib/filter.h"
int r = 0;
add_language_controls (table, r);
+ add_label_to_sizer (table, _panel, _("Interface complexity"), true, wxGBPosition(r, 0));
+ _interface_complexity = new wxChoice (_panel, wxID_ANY);
+ table->Add (_interface_complexity, wxGBPosition (r, 1));
+ ++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 (_master_encoding_threads, wxGBPosition (r, 1));
++r;
add_label_to_sizer (table, _panel, _("Configuration file"), true, wxGBPosition (r, 0));
- _config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true);
+ _config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true, true);
table->Add (_config_file, 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", true);
+ _cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true, true);
table->Add (_cinemas_file, wxGBPosition (r, 1));
+ Button* export_cinemas = new Button (_panel, _("Export..."));
+ table->Add (export_cinemas, wxGBPosition (r, 2));
++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"));
+ _analyse_ebur128 = new CheckBox (_panel, _("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"));
+ _automatic_audio_analysis = new CheckBox (_panel, _("Automatically analyse content audio"));
table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
_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));
+ _interface_complexity->Append (_("Simple"));
+ _interface_complexity->Append (_("Full"));
+ _interface_complexity->Bind (wxEVT_CHOICE, boost::bind(&FullGeneralPage::interface_complexity_changed, this));
+
_master_encoding_threads->SetRange (1, 128);
_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 (&FullGeneralPage::server_encoding_threads_changed, this));
+ export_cinemas->Bind (wxEVT_BUTTON, boost::bind (&FullGeneralPage::export_cinemas_file, this));
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
{
Config* config = Config::instance ();
+ switch (config->interface_complexity()) {
+ case Config::INTERFACE_SIMPLE:
+ checked_set (_interface_complexity, 0);
+ break;
+ case Config::INTERFACE_FULL:
+ checked_set (_interface_complexity, 1);
+ break;
+ }
checked_set (_master_encoding_threads, config->master_encoding_threads ());
checked_set (_server_encoding_threads, config->server_encoding_threads ());
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
GeneralPage::config_changed ();
}
+ void export_cinemas_file ()
+ {
+ wxFileDialog* d = new wxFileDialog (
+ _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"),
+ wxFD_SAVE | wxFD_OVERWRITE_PROMPT
+ );
+
+ if (d->ShowModal () == wxID_OK) {
+ boost::filesystem::copy_file (Config::instance()->cinemas_file(), wx_to_std(d->GetPath()));
+ }
+ d->Destroy ();
+ }
+
+ void interface_complexity_changed ()
+ {
+ if (_interface_complexity->GetSelection() == 0) {
+ Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
+ } else {
+ Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
+ }
+ }
+
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
void analyse_ebur128_changed ()
Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
}
+ wxChoice* _interface_complexity;
wxSpinCtrl* _master_encoding_threads;
wxSpinCtrl* _server_encoding_threads;
FilePickerCtrl* _config_file;
table->Add (_directory, 1, wxEXPAND);
add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true);
- _isdcf_metadata_button = new wxButton (_panel, wxID_ANY, _("Edit..."));
+ _isdcf_metadata_button = new Button (_panel, _("Edit..."));
table->Add (_isdcf_metadata_button);
add_label_to_sizer (table, _panel, _("Default container"), true);
table->Add (_kdm_directory, 1, wxEXPAND);
- _upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Default to enabling upload of DCP to TMS"));
+ _upload_after_make_dcp = new CheckBox (_panel, _("Default to enabling upload of DCP to TMS"));
table->Add (_upload_after_make_dcp, 1, wxEXPAND);
_still_length->SetRange (1, 3600);
private:
void setup ()
{
- _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Search network for servers"));
+ _use_any_servers = new CheckBox (_panel, _("Search network for servers"));
_panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
- vector<string> columns;
- columns.push_back (wx_to_std (_("IP address / host name")));
+ vector<EditableListColumn> columns;
+ columns.push_back (EditableListColumn(wx_to_std(_("IP address / host name"))));
_servers_list = new EditableList<string, ServerDialog> (
_panel,
columns,
table->Add (_tms_user, 1, wxEXPAND);
add_label_to_sizer (table, _panel, _("Password"), true);
- _tms_password = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_tms_password, 1, wxEXPAND);
+ _tms_password = new PasswordEntry (_panel);
+ table->Add (_tms_password->get_panel(), 1, wxEXPAND);
_tms_protocol->Append (_("SCP (for AAM and Doremi)"));
_tms_protocol->Append (_("FTP (for Dolby)"));
_tms_ip->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_ip_changed, this));
_tms_path->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_path_changed, this));
_tms_user->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_user_changed, this));
- _tms_password->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_password_changed, this));
+ _tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this));
}
void config_changed ()
void tms_protocol_changed ()
{
- Config::instance()->set_tms_protocol (static_cast<Protocol> (_tms_protocol->GetSelection ()));
+ Config::instance()->set_tms_protocol(static_cast<FileTransferProtocol>(_tms_protocol->GetSelection()));
}
void tms_ip_changed ()
void tms_password_changed ()
{
- Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
+ Config::instance()->set_tms_password (_tms_password->get());
}
wxChoice* _tms_protocol;
wxTextCtrl* _tms_ip;
wxTextCtrl* _tms_path;
wxTextCtrl* _tms_user;
- wxTextCtrl* _tms_password;
+ PasswordEntry* _tms_password;
};
static string
_port = new wxSpinCtrl (_panel, wxID_ANY);
_port->SetRange (0, 65535);
s->Add (_port);
+ add_label_to_sizer (s, _panel, _("protocol"), false);
+ _protocol = new wxChoice (_panel, wxID_ANY);
+ /* Make sure this matches the switches in config_changed and port_changed below */
+ _protocol->Append (_("Auto"));
+ _protocol->Append (_("Plain"));
+ _protocol->Append (_("STARTTLS"));
+ _protocol->Append (_("SSL"));
+ s->Add (_protocol);
table->Add (s, 1, wxEXPAND | wxALL);
}
- add_label_to_sizer (table, _panel, _("Mail user name"), true);
+ add_label_to_sizer (table, _panel, _("User name"), true);
_user = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_user, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("Mail password"), true);
- _password = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_password, 1, wxEXPAND | wxALL);
+ add_label_to_sizer (table, _panel, _("Password"), true);
+ _password = new PasswordEntry (_panel);
+ table->Add (_password->get_panel(), 1, wxEXPAND | wxALL);
_server->Bind (wxEVT_TEXT, boost::bind (&EmailPage::server_changed, this));
_port->Bind (wxEVT_SPINCTRL, boost::bind (&EmailPage::port_changed, this));
+ _protocol->Bind (wxEVT_CHOICE, boost::bind (&EmailPage::protocol_changed, this));
_user->Bind (wxEVT_TEXT, boost::bind (&EmailPage::user_changed, this));
- _password->Bind (wxEVT_TEXT, boost::bind (&EmailPage::password_changed, this));
+ _password->Changed.connect (boost::bind (&EmailPage::password_changed, this));
}
void config_changed ()
checked_set (_server, config->mail_server ());
checked_set (_port, config->mail_port ());
+ switch (config->mail_protocol()) {
+ case EMAIL_PROTOCOL_AUTO:
+ checked_set (_protocol, 0);
+ break;
+ case EMAIL_PROTOCOL_PLAIN:
+ checked_set (_protocol, 1);
+ break;
+ case EMAIL_PROTOCOL_STARTTLS:
+ checked_set (_protocol, 2);
+ break;
+ case EMAIL_PROTOCOL_SSL:
+ checked_set (_protocol, 3);
+ break;
+ }
checked_set (_user, config->mail_user ());
- checked_set (_password, config->mail_password ());
+ checked_set (_password, config->mail_password());
}
void server_changed ()
Config::instance()->set_mail_port (_port->GetValue ());
}
+ void protocol_changed ()
+ {
+ switch (_protocol->GetSelection()) {
+ case 0:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_AUTO);
+ break;
+ case 1:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_PLAIN);
+ break;
+ case 2:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_STARTTLS);
+ break;
+ case 3:
+ Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_SSL);
+ break;
+ }
+ }
+
void user_changed ()
{
Config::instance()->set_mail_user (wx_to_std (_user->GetValue ()));
void password_changed ()
{
- Config::instance()->set_mail_password (wx_to_std (_password->GetValue ()));
+ Config::instance()->set_mail_password(_password->get());
}
wxTextCtrl* _server;
wxSpinCtrl* _port;
+ wxChoice* _protocol;
wxTextCtrl* _user;
- wxTextCtrl* _password;
+ PasswordEntry* _password;
};
class KDMEmailPage : public StandardPage
_from = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_from, 1, wxEXPAND | wxALL);
- vector<string> columns;
- columns.push_back (wx_to_std (_("Address")));
+ vector<EditableListColumn> columns;
+ columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
add_label_to_sizer (table, _panel, _("CC addresses"), true);
_cc = new EditableList<string, EmailDialog> (
_panel,
_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
_panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border);
- _reset_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
+ _reset_email = new Button (_panel, _("Reset to default subject and text"));
_panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
_cc->layout ();
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
- _enable_message_box = new wxCheckBox (_panel, wxID_ANY, _("Message box"));
+ _enable_message_box = new CheckBox (_panel, _("Message box"));
table->Add (_enable_message_box, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
- _enable_email = new wxCheckBox (_panel, wxID_ANY, _("Email"));
+ _enable_email = new CheckBox (_panel, _("Email"));
table->Add (_enable_email, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
_to = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_to, 1, wxEXPAND | wxALL);
- vector<string> columns;
- columns.push_back (wx_to_std (_("Address")));
+ vector<EditableListColumn> columns;
+ columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
add_label_to_sizer (table, _panel, _("CC addresses"), true);
_cc = new EditableList<string, EmailDialog> (
_panel,
_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
_panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border);
- _reset_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
+ _reset_email = new Button (_panel, _("Reset to default subject and text"));
_panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
_cc->layout ();
_cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
_panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border);
- _reset_cover_sheet = new wxButton (_panel, wxID_ANY, _("Reset to default text"));
+ _reset_cover_sheet = new Button (_panel, _("Reset to default text"));
_panel->GetSizer()->Add (_reset_cover_sheet, 0, wxEXPAND | wxALL, _border);
_cover_sheet->Bind (wxEVT_TEXT, boost::bind (&CoverSheetPage::cover_sheet_changed, this));
: StockPage (Kind_Advanced, panel_size, border)
, _maximum_j2k_bandwidth (0)
, _allow_any_dcp_frame_rate (0)
+ , _allow_any_container (0)
+ , _show_experimental_audio_processors (0)
, _only_servers_encode (0)
, _log_general (0)
, _log_warning (0)
flags |= wxALIGN_RIGHT;
text += wxT (":");
#endif
- wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+ wxStaticText* m = new StaticText (parent, text);
table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
}
table->Add (s, 1);
}
- _allow_any_dcp_frame_rate = new wxCheckBox (_panel, wxID_ANY, _("Allow any DCP frame rate"));
+ add_label_to_sizer (table, _panel, _("Video display mode"), true);
+ _video_display_mode = new wxChoice (_panel, wxID_ANY);
+ table->Add (_video_display_mode);
+
+ wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to change display mode)"), false);
+ wxFont font = restart->GetFont();
+ font.SetStyle (wxFONTSTYLE_ITALIC);
+ font.SetPointSize (font.GetPointSize() - 1);
+ restart->SetFont (font);
+ table->AddSpacer (0);
+
+ _allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate"));
table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
- _only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode"));
+ _allow_any_container = new CheckBox (_panel, _("Allow non-standard container ratios"));
+ table->Add (_allow_any_container, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
+ restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see all ratios)"), false);
+ restart->SetFont (font);
+ table->AddSpacer (0);
+
+ _show_experimental_audio_processors = new CheckBox (_panel, _("Show experimental audio processors"));
+ table->Add (_show_experimental_audio_processors, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
+ _only_servers_encode = new CheckBox (_panel, _("Only servers encode"));
table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
{
add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format"));
dcp::NameFormat::Map titles;
- titles['t'] = "type (cpl/pkl)";
+ titles['t'] = wx_to_std (_("type (cpl/pkl)"));
dcp::NameFormat::Map examples;
examples['t'] = "cpl";
_dcp_metadata_filename_format = new NameFormatEditor (
{
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";
+ titles['t'] = wx_to_std (_("type (j2c/pcm/sub)"));
+ titles['r'] = wx_to_std (_("reel number"));
+ titles['n'] = wx_to_std (_("number of reels"));
+ titles['c'] = wx_to_std (_("content filename"));
dcp::NameFormat::Map examples;
examples['t'] = "j2c";
examples['r'] = "1";
{
add_top_aligned_label_to_sizer (table, _panel, _("Log"));
wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
- _log_general = new wxCheckBox (_panel, wxID_ANY, _("General"));
+ _log_general = new CheckBox (_panel, _("General"));
t->Add (_log_general, 1, wxEXPAND | wxALL);
- _log_warning = new wxCheckBox (_panel, wxID_ANY, _("Warnings"));
+ _log_warning = new CheckBox (_panel, _("Warnings"));
t->Add (_log_warning, 1, wxEXPAND | wxALL);
- _log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors"));
+ _log_error = new CheckBox (_panel, _("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"));
+ _log_timing = new CheckBox (_panel, S_("Config|Timing"));
t->Add (_log_timing, 1, wxEXPAND | wxALL);
- _log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode"));
+ _log_debug_decode = new CheckBox (_panel, _("Debug: decode"));
t->Add (_log_debug_decode, 1, wxEXPAND | wxALL);
- _log_debug_encode = new wxCheckBox (_panel, wxID_ANY, _("Debug: encode"));
+ _log_debug_encode = new CheckBox (_panel, _("Debug: encode"));
t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
- _log_debug_email = new wxCheckBox (_panel, wxID_ANY, _("Debug: email sending"));
+ _log_debug_email = new CheckBox (_panel, _("Debug: email sending"));
t->Add (_log_debug_email, 1, wxEXPAND | wxALL);
table->Add (t, 0, wxALL, 6);
}
#ifdef DCPOMATIC_WINDOWS
- _win32_console = new wxCheckBox (_panel, wxID_ANY, _("Open console window"));
+ _win32_console = new CheckBox (_panel, _("Open console window"));
table->Add (_win32_console, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
#endif
_maximum_j2k_bandwidth->SetRange (1, 1000);
_maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
+ _video_display_mode->Append (_("Simple (safer)"));
+ _video_display_mode->Append (_("OpenGL (faster)"));
+ _video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this));
_allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
+ _allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this));
+ _show_experimental_audio_processors->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::show_experimental_audio_processors_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));
Config* config = Config::instance ();
checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
+ switch (config->video_view_type()) {
+ case Config::VIDEO_VIEW_SIMPLE:
+ checked_set (_video_display_mode, 0);
+ break;
+ case Config::VIDEO_VIEW_OPENGL:
+ checked_set (_video_display_mode, 1);
+ break;
+ }
checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
+ checked_set (_allow_any_container, config->allow_any_container ());
+ checked_set (_show_experimental_audio_processors, config->show_experimental_audio_processors ());
checked_set (_only_servers_encode, config->only_servers_encode ());
checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
Config::instance()->set_maximum_j2k_bandwidth (_maximum_j2k_bandwidth->GetValue() * 1000000);
}
+ void video_display_mode_changed ()
+ {
+ if (_video_display_mode->GetSelection() == 0) {
+ Config::instance()->set_video_view_type (Config::VIDEO_VIEW_SIMPLE);
+ } else {
+ Config::instance()->set_video_view_type (Config::VIDEO_VIEW_OPENGL);
+ }
+ }
+
void frames_in_memory_multiplier_changed ()
{
Config::instance()->set_frames_in_memory_multiplier (_frames_in_memory_multiplier->GetValue());
Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ());
}
+ void allow_any_container_changed ()
+ {
+ Config::instance()->set_allow_any_container (_allow_any_container->GetValue ());
+ }
+
+ void show_experimental_audio_processors_changed ()
+ {
+ Config::instance()->set_show_experimental_audio_processors (_show_experimental_audio_processors->GetValue ());
+ }
+
void only_servers_encode_changed ()
{
Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ());
#endif
wxSpinCtrl* _maximum_j2k_bandwidth;
+ wxChoice* _video_display_mode;
wxSpinCtrl* _frames_in_memory_multiplier;
wxCheckBox* _allow_any_dcp_frame_rate;
+ wxCheckBox* _allow_any_container;
+ wxCheckBox* _show_experimental_audio_processors;
wxCheckBox* _only_servers_encode;
NameFormatEditor* _dcp_metadata_filename_format;
NameFormatEditor* _dcp_asset_filename_format;
the containing window doesn't shrink too much when we select those panels.
This is obviously an unpleasant hack.
*/
- wxSize ps = wxSize (600, -1);
+ wxSize ps = wxSize (700, -1);
int const border = 16;
#else
wxSize ps = wxSize (-1, -1);
#endif
e->AddPage (new FullGeneralPage (ps, border));
+ e->AddPage (new SoundPage (ps, border));
e->AddPage (new DefaultsPage (ps, border));
e->AddPage (new EncodingServersPage (ps, border));
e->AddPage (new KeysPage (ps, border));
projects / dcpomatic.git / blobdiff