Simplification of name format stuff.

[dcpomatic.git] / src / wx / config_dialog.cc

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 1cbad576c07fc1475039b5f20b44774f36484b14..a68f4576dc69f50a5955f64ed1e94bdf8c8383fd 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -32,6 +32,7 @@
 #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"
@@ -43,6 +44,7 @@
 #include "lib/exceptions.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+#include <dcp/raw_convert.h>
 #include <wx/stdpaths.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
@@ -432,6 +434,10 @@ private:
                _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);
@@ -473,7 +479,10 @@ private:
                        _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));
@@ -508,6 +517,7 @@ private:
                _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, raw_convert<string> (config->default_dcp_audio_channels()));
                checked_set (_audio_delay, config->default_audio_delay ());
                checked_set (_standard, config->default_interop() ? 1 : 0);
        }
@@ -522,6 +532,14 @@ private:
                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 (dcp::raw_convert<int> (string_client_data (_dcp_audio_channels->GetClientObject (s))));
+               }
+       }
+
        void directory_changed ()
        {
                Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
@@ -568,6 +586,7 @@ private:
 #endif
        wxChoice* _container;
        wxChoice* _dcp_content_type;
+       wxChoice* _dcp_audio_channels;
        wxChoice* _standard;
 };
 
@@ -1380,6 +1399,26 @@ private:
                table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
                table->AddSpacer (0);
 
+               {
+                       int flags = wxALIGN_TOP | wxTOP | wxLEFT;
+                       wxString t = _("DCP filename format");
+#ifdef __WXOSX__
+                       flags |= wxALIGN_RIGHT;
+                       t += wxT (":");
+#endif
+                       wxStaticText* m = new wxStaticText (_panel, wxID_ANY, t);
+                       table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
+               }
+
+               dcp::NameFormat::Map titles;
+               titles['t'] = "type (j2c/pcm/sub/cpl/pkl)";
+               titles['i'] = "unique ID";
+               dcp::NameFormat::Map examples;
+               examples['t'] = "j2c";
+               examples['i'] = "eb1c112c-ca3c-4ae6-9263-c6714ff05d64";
+               _dcp_filename_format = new NameFormatEditor<dcp::FilenameFormat> (_panel, Config::instance()->dcp_filename_format(), titles, examples);
+               table->Add (_dcp_filename_format->panel(), 1, wxEXPAND | wxALL);
+
 #ifdef __WXOSX__
                wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:"));
                table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6);
@@ -1418,6 +1457,7 @@ private:
                _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_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_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));
@@ -1464,6 +1504,11 @@ private:
                Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ());
        }
 
+       void dcp_filename_format_changed ()
+       {
+               Config::instance()->set_dcp_filename_format (_dcp_filename_format->get ());
+       }
+
        void log_changed ()
        {
                int types = 0;
@@ -1501,6 +1546,7 @@ private:
        wxSpinCtrl* _maximum_j2k_bandwidth;
        wxCheckBox* _allow_any_dcp_frame_rate;
        wxCheckBox* _only_servers_encode;
+       NameFormatEditor<dcp::FilenameFormat>* _dcp_filename_format;
        wxCheckBox* _log_general;
        wxCheckBox* _log_warning;
        wxCheckBox* _log_error;