Ignore empty KDM email addresses (#818).

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

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index de0ac8176af488e1ac648a1959c624ae93ebaa0b..50d806f35ea7955868fe8d22c05e85ccccad0dc1 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -46,7 +46,6 @@
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
-#include <boost/lexical_cast.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -57,7 +56,6 @@ using std::list;
 using std::cout;
 using boost::bind;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::function;
 using boost::optional;
 
@@ -172,6 +170,7 @@ private:
                _language->Append (wxT ("Português europeu"));
                _language->Append (wxT ("Slovenský jazyk"));
                _language->Append (wxT ("Čeština"));
+               _language->Append (wxT ("українська мова"));
                table->Add (_language, wxGBPosition (r, 1));
                ++r;
 
@@ -194,6 +193,12 @@ private:
                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;
@@ -227,6 +232,9 @@ private:
                _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));
@@ -265,11 +273,16 @@ private:
                        checked_set (_language, 11);
                } else if (config->language().get_value_or ("") == "cs") {
                        checked_set (_language, 12);
+               } else if (config->language().get_value_or ("") == "uk") {
+                       checked_set (_language, 13);
                } else {
                        _language->SetSelection (1);
                }
 
                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 ());
@@ -338,9 +351,19 @@ private:
                case 12:
                        Config::instance()->set_language ("cs");
                        break;
+               case 13:
+                       Config::instance()->set_language ("uk");
+                       break;
                }
        }
 
+#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 ());
@@ -380,6 +403,9 @@ private:
        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;
@@ -613,6 +639,7 @@ private:
                        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)
                        );
 
@@ -1225,7 +1252,12 @@ private:
                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);