Various build fixes.

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

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 12ccf11e50c0c160623b927a239ba5a36048bd27..9b4c10029fbd5e6b12d84d264f2a32f8940347da 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -40,6 +40,7 @@
 #include "lib/raw_convert.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
+#include "lib/jpeg2000_encoder.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
 #include <wx/stdpaths.h>
@@ -161,19 +162,21 @@ private:
                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 ("Svenska", "sv_SE"));
                languages.push_back (make_pair ("Русский", "ru_RU"));
                languages.push_back (make_pair ("Polski", "pl_PL"));
-               languages.push_back (make_pair ("Dansk", "da_DK"));
                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 ("Čeština", "cs_CZ"));
                languages.push_back (make_pair ("українська мова", "uk_UA"));
                checked_set (_language, languages);
                table->Add (_language, wxGBPosition (r, 1));
@@ -230,8 +233,16 @@ private:
                table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
                ++r;
 
-               _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED,   boost::bind (&GeneralPage::set_language_changed, this));
-               _language->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,    boost::bind (&GeneralPage::language_changed,     this));
+               add_label_to_sizer (table, _panel, _("JPEG2000 encoder"), true, wxGBPosition (r, 0));
+               _encoder = new wxChoice (_panel, wxID_ANY);
+               BOOST_FOREACH (shared_ptr<JPEG2000Encoder> i, JPEG2000Encoder::all()) {
+                       _encoder->Append (std_to_wx (i->name ()));
+               }
+               table->Add (_encoder, wxGBPosition (r, 1));
+               ++r;
+
+               _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::set_language_changed, this));
+               _language->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&GeneralPage::language_changed,     this));
                _cinemas_file->Bind (wxEVT_COMMAND_FILEPICKER_CHANGED, boost::bind (&GeneralPage::cinemas_file_changed, this));
 
                _num_local_encoding_threads->SetRange (1, 128);
@@ -290,6 +301,17 @@ private:
                checked_set (_cinemas_file, config->cinemas_file());
 
                setup_sensitivity ();
+
+               if (!config->encoder ()) {
+                       checked_set (_encoder, 0);
+               } else {
+                       vector<shared_ptr<JPEG2000Encoder> > encoders = JPEG2000Encoder::all ();
+                       for (size_t i = 0; i < encoders.size(); ++i) {
+                               if (encoders[i]->id() == config->encoder().get ()) {
+                                       checked_set (_encoder, i);
+                               }
+                       }
+               }
        }
 
        void setup_sensitivity ()
@@ -372,6 +394,7 @@ private:
        wxCheckBox* _check_for_test_updates;
        wxTextCtrl* _issuer;
        wxTextCtrl* _creator;
+       wxChoice* _encoder;
 };
 
 class DefaultsPage : public StandardPage