add_update_controls (table, r);
- wxFlexGridSizer* bottom_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- bottom_table->AddGrowableCol (1, 1);
-
- add_label_to_sizer (bottom_table, _panel, _("Issuer"), true);
- _issuer = new wxTextCtrl (_panel, wxID_ANY);
- bottom_table->Add (_issuer, 1, wxALL | wxEXPAND);
-
- add_label_to_sizer (bottom_table, _panel, _("Creator"), true);
- _creator = new wxTextCtrl (_panel, wxID_ANY);
- bottom_table->Add (_creator, 1, wxALL | wxEXPAND);
-
- table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
- ++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));
_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
#endif
_automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_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 ()
checked_set (_analyse_ebur128, config->analyse_ebur128 ());
#endif
checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ());
- 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());
Config::instance()->set_server_encoding_threads (_server_encoding_threads->GetValue ());
}
- void issuer_changed ()
- {
- Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
- }
-
- void creator_changed ()
- {
- Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
- }
-
void config_file_changed ()
{
Config* config = Config::instance();
wxCheckBox* _analyse_ebur128;
#endif
wxCheckBox* _automatic_audio_analysis;
- wxTextCtrl* _issuer;
- wxTextCtrl* _creator;
};
class DefaultsPage : public StandardPage
table->Add (_kdm_directory, 1, wxEXPAND);
- _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);
_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
private:
void setup ()
{
+ _upload = new CheckBox (_panel, _("Upload DCP to TMS after creation"));
+ _panel->GetSizer()->Add (_upload, 0, wxALL | wxEXPAND, _border);
+
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
_tms_protocol->Append (_("SCP (for AAM and Doremi)"));
_tms_protocol->Append (_("FTP (for Dolby)"));
+ _upload->Bind (wxEVT_CHECKBOX, boost::bind(&TMSPage::upload_changed, this));
_tms_protocol->Bind (wxEVT_CHOICE, boost::bind (&TMSPage::tms_protocol_changed, this));
_tms_ip->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_ip_changed, this));
_tms_path->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_path_changed, this));
{
Config* config = Config::instance ();
+ checked_set (_upload, config->upload_after_make_dcp());
checked_set (_tms_protocol, config->tms_protocol ());
checked_set (_tms_ip, config->tms_ip ());
checked_set (_tms_path, config->tms_path ());
checked_set (_tms_password, config->tms_password ());
}
+ void upload_changed ()
+ {
+ Config::instance()->set_upload_after_make_dcp (_upload->GetValue());
+ }
+
void tms_protocol_changed ()
{
Config::instance()->set_tms_protocol(static_cast<FileTransferProtocol>(_tms_protocol->GetSelection()));
Config::instance()->set_tms_password (_tms_password->get());
}
+ CheckBox* _upload;
wxChoice* _tms_protocol;
wxTextCtrl* _tms_ip;
wxTextCtrl* _tms_path;
};
+class IdentifiersPage : public StandardPage
+{
+public:
+ IdentifiersPage (wxSize panel_size, int border)
+ : StandardPage (panel_size, border)
+ {}
+
+ wxString GetName () const
+ {
+ return _("Identifiers");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("identifiers", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
+private:
+ void setup ()
+ {
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+
+ add_label_to_sizer (table, _panel, _("Issuer"), true);
+ _issuer = new wxTextCtrl (_panel, wxID_ANY);
+ _issuer->SetToolTip (_("This will be written to the DCP's XML files as the <Issuer>. If it is blank, a default value mentioning DCP-o-matic will be used."));
+ table->Add (_issuer, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Creator"), true);
+ _creator = new wxTextCtrl (_panel, wxID_ANY);
+ _creator->SetToolTip (_("This will be written to the DCP's XML files as the <Creator>. If it is blank, a default value mentioning DCP-o-matic will be used."));
+ table->Add (_creator, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Company name"), true);
+ _company_name = new wxTextCtrl (_panel, wxID_ANY);
+ _company_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'company name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_company_name, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Product name"), true);
+ _product_name = new wxTextCtrl (_panel, wxID_ANY);
+ _product_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'product name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_product_name, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Product version"), true);
+ _product_version = new wxTextCtrl (_panel, wxID_ANY);
+ _product_version->SetToolTip (_("This will be written to the DCP's MXF files as the 'product version'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_product_version, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("JPEG2000 comment"), true);
+ _j2k_comment = new wxTextCtrl (_panel, wxID_ANY);
+ _j2k_comment->SetToolTip (_("This will be written to the DCP's JPEG2000 data as a comment. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_j2k_comment, 1, wxALL | wxEXPAND);
+
+ _panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border);
+
+ _issuer->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::issuer_changed, this));
+ _creator->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::creator_changed, this));
+ _company_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::company_name_changed, this));
+ _product_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_name_changed, this));
+ _product_version->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_version_changed, this));
+ _j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this));
+ }
+
+ void config_changed ()
+ {
+ Config* config = Config::instance ();
+ checked_set (_issuer, config->dcp_issuer ());
+ checked_set (_creator, config->dcp_creator ());
+ checked_set (_company_name, config->dcp_company_name ());
+ checked_set (_product_name, config->dcp_product_name ());
+ checked_set (_product_version, config->dcp_product_version ());
+ checked_set (_j2k_comment, config->dcp_j2k_comment ());
+ }
+
+ void issuer_changed ()
+ {
+ Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
+ }
+
+ void creator_changed ()
+ {
+ Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
+ }
+
+ void company_name_changed ()
+ {
+ Config::instance()->set_dcp_company_name (wx_to_std(_company_name->GetValue()));
+ }
+
+ void product_name_changed ()
+ {
+ Config::instance()->set_dcp_product_name (wx_to_std(_product_name->GetValue()));
+ }
+
+ void product_version_changed ()
+ {
+ Config::instance()->set_dcp_product_version (wx_to_std(_product_version->GetValue()));
+ }
+
+ void j2k_comment_changed ()
+ {
+ Config::instance()->set_dcp_j2k_comment (wx_to_std(_j2k_comment->GetValue()));
+ }
+
+ wxTextCtrl* _issuer;
+ wxTextCtrl* _creator;
+ wxTextCtrl* _company_name;
+ wxTextCtrl* _product_name;
+ wxTextCtrl* _product_version;
+ wxTextCtrl* _j2k_comment;
+};
+
+
/** @class AdvancedPage
* @brief Advanced page of the preferences dialog.
*/
, _log_debug_threed (0)
, _log_debug_encode (0)
, _log_debug_email (0)
+ , _log_debug_video_view (0)
+ , _log_debug_player (0)
+ , _log_debug_audio_analysis (0)
{}
private:
table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
- _allow_any_container = new CheckBox (_panel, _("Allow non-standard container ratios"));
+ _allow_any_container = new CheckBox (_panel, _("Allow full-frame and non-standard container ratios"));
table->Add (_allow_any_container, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
_log_debug_email = new CheckBox (_panel, _("Debug: email sending"));
t->Add (_log_debug_email, 1, wxEXPAND | wxALL);
+ _log_debug_video_view = new CheckBox (_panel, _("Debug: video view"));
+ t->Add (_log_debug_video_view, 1, wxEXPAND | wxALL);
+ _log_debug_player = new CheckBox (_panel, _("Debug: player"));
+ t->Add (_log_debug_player, 1, wxEXPAND | wxALL);
+ _log_debug_audio_analysis = new CheckBox (_panel, _("Debug: audio analysis"));
+ t->Add (_log_debug_audio_analysis, 1, wxEXPAND | wxALL);
table->Add (t, 0, wxALL, 6);
}
_log_debug_threed->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
_log_debug_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
_log_debug_email->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+ _log_debug_video_view->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+ _log_debug_player->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+ _log_debug_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
#ifdef DCPOMATIC_WINDOWS
_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::win32_console_changed, this));
#endif
checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREED);
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 (_log_debug_video_view, config->log_types() & LogEntry::TYPE_DEBUG_VIDEO_VIEW);
+ checked_set (_log_debug_player, config->log_types() & LogEntry::TYPE_DEBUG_PLAYER);
+ checked_set (_log_debug_audio_analysis, config->log_types() & LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS);
checked_set (_frames_in_memory_multiplier, config->frames_in_memory_multiplier());
#ifdef DCPOMATIC_WINDOWS
checked_set (_win32_console, config->win32_console());
if (_log_debug_email->GetValue ()) {
types |= LogEntry::TYPE_DEBUG_EMAIL;
}
+ if (_log_debug_video_view->GetValue()) {
+ types |= LogEntry::TYPE_DEBUG_VIDEO_VIEW;
+ }
+ if (_log_debug_player->GetValue()) {
+ types |= LogEntry::TYPE_DEBUG_PLAYER;
+ }
+ if (_log_debug_audio_analysis->GetValue()) {
+ types |= LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS;
+ }
Config::instance()->set_log_types (types);
}
wxCheckBox* _log_debug_threed;
wxCheckBox* _log_debug_encode;
wxCheckBox* _log_debug_email;
+ wxCheckBox* _log_debug_video_view;
+ wxCheckBox* _log_debug_player;
+ wxCheckBox* _log_debug_audio_analysis;
#ifdef DCPOMATIC_WINDOWS
wxCheckBox* _win32_console;
#endif
e->AddPage (new KDMEmailPage (ps, border));
e->AddPage (new NotificationsPage (ps, border));
e->AddPage (new CoverSheetPage (ps, border));
+ e->AddPage (new IdentifiersPage (ps, border));
e->AddPage (new AdvancedPage (ps, border));
return e;
}
projects / dcpomatic.git / blobdiff