Use territory details from template.
[dcpomatic.git] / src / wx / full_config_dialog.cc
index 2947d98ebea12effcd13eff83a1a482245f9bdec..955ea649307ba2e795f8fc0acba285ed1e3a3cdd 100644 (file)
@@ -52,7 +52,6 @@
 #include "wx_variant.h"
 #include "lib/config.h"
 #include "lib/cross.h"
-#include "lib/dcp_content_type.h"
 #include "lib/email.h"
 #include "lib/exceptions.h"
 #include "lib/filter.h"
@@ -311,23 +310,6 @@ private:
 #endif
                table->Add (_directory, 1, wxEXPAND);
 
-               add_label_to_sizer (table, _panel, _("Default content type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-               _dcp_content_type = new wxChoice (_panel, wxID_ANY);
-               table->Add (_dcp_content_type);
-
-               add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-               _dcp_audio_channels = new wxChoice (_panel, wxID_ANY);
-               table->Add (_dcp_audio_channels);
-
-               {
-                       add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-                       auto s = new wxBoxSizer (wxHORIZONTAL);
-                       _video_bit_rate = new wxSpinCtrl(_panel);
-                       s->Add(_video_bit_rate);
-                       add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-                       table->Add (s, 1);
-               }
-
                {
                        add_label_to_sizer (table, _panel, _("Default audio delay"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
                        auto s = new wxBoxSizer (wxHORIZONTAL);
@@ -337,32 +319,11 @@ private:
                        table->Add (s, 1);
                }
 
-               add_label_to_sizer (table, _panel, _("Default standard"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-               _standard = new wxChoice (_panel, wxID_ANY);
-               table->Add (_standard);
-
                _enable_audio_language = new CheckBox(_panel, _("Default audio language"));
                table->Add(_enable_audio_language, 1, wxEXPAND | wxALIGN_CENTRE_VERTICAL);
                _audio_language = new LanguageTagWidget(_panel, _("Default audio language to use for new DCPs"), Config::instance()->default_audio_language(), wxString("cmnr-Hant-"));
                table->Add(_audio_language->sizer());
 
-               _enable_territory = new CheckBox(_panel, _("Default territory"));
-               table->Add(_enable_territory, 1, wxEXPAND | wxALIGN_CENTRE_VERTICAL);
-               _territory = new RegionSubtagWidget(_panel, _("Default territory to use for new DCPs"), Config::instance()->default_territory(), wxString("cmnr-Hant-"));
-               table->Add(_territory->sizer());
-
-               table->Add (_enable_metadata["facility"] = new CheckBox (_panel, _("Default facility")), 0, wxALIGN_CENTRE_VERTICAL);
-               table->Add (_metadata["facility"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND);
-
-               table->Add (_enable_metadata["studio"] = new CheckBox (_panel, _("Default studio")), 0, wxALIGN_CENTRE_VERTICAL);
-               table->Add (_metadata["studio"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND);
-
-               table->Add (_enable_metadata["chain"] = new CheckBox (_panel, _("Default chain")), 0, wxALIGN_CENTRE_VERTICAL);
-               table->Add (_metadata["chain"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND);
-
-               table->Add (_enable_metadata["distributor"] = new CheckBox (_panel, _("Default distributor")), 0, wxALIGN_CENTRE_VERTICAL);
-               table->Add (_metadata["distributor"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND);
-
                add_label_to_sizer (table, _panel, _("Default KDM directory"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 #ifdef DCPOMATIC_USE_OWN_PICKER
                _kdm_directory = new DirPickerCtrl (_panel);
@@ -401,86 +362,25 @@ private:
 
                _use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this);
 
-               for (auto i: DCPContentType::all()) {
-                       _dcp_content_type->Append (std_to_wx (i->pretty_name ()));
-               }
-
-               setup_audio_channels_choice (_dcp_audio_channels, 2);
-
-               _dcp_content_type->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
-               _dcp_audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::dcp_audio_channels_changed, this));
-
-               _video_bit_rate->SetRange(50, 250);
-               _video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&DefaultsPage::video_bit_rate_changed, this));
-
                _audio_delay->SetRange (-1000, 1000);
                _audio_delay->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::audio_delay_changed, this));
 
-               _standard->Append (_("SMPTE"));
-               _standard->Append (_("Interop"));
-               _standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this));
-
-               for (auto const& i: _enable_metadata) {
-                       i.second->bind(&DefaultsPage::metadata_changed, this);
-               }
-
-               for (auto const& i: _metadata) {
-                       i.second->Bind (wxEVT_TEXT, boost::bind(&DefaultsPage::metadata_changed, this));
-               }
-
                _enable_audio_language->bind(&DefaultsPage::enable_audio_language_toggled, this);
                _audio_language->Changed.connect(boost::bind(&DefaultsPage::audio_language_changed, this));
-
-               _enable_territory->bind(&DefaultsPage::enable_territory_toggled, this);
-               _territory->Changed.connect(boost::bind(&DefaultsPage::territory_changed, this));
        }
 
        void config_changed () override
        {
                auto config = Config::instance ();
-
-               auto const ct = DCPContentType::all ();
-               for (size_t i = 0; i < ct.size(); ++i) {
-                       if (ct[i] == config->default_dcp_content_type()) {
-                               _dcp_content_type->SetSelection (i);
-                       }
-               }
-
                checked_set (_still_length, config->default_still_length ());
                _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
                _kdm_directory->SetPath (std_to_wx (config->default_kdm_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
                _kdm_type->set (config->default_kdm_type());
                checked_set (_use_isdcf_name_by_default, config->use_isdcf_name_by_default());
-               checked_set(_video_bit_rate, config->default_video_bit_rate() / 1000000);
-               _video_bit_rate->SetRange(50, config->maximum_video_bit_rate() / 1000000);
-               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);
                auto dal = config->default_audio_language();
                checked_set(_enable_audio_language, static_cast<bool>(dal));
                checked_set(_audio_language, dal ? dal : boost::none);
-               auto dt = config->default_territory();
-               checked_set(_enable_territory, static_cast<bool>(dt));
-               checked_set(_territory, dt ? dt : boost::none);
-
-               auto metadata = config->default_metadata();
-
-               for (auto const& i: metadata) {
-                       _enable_metadata[i.first]->SetValue(true);
-                       checked_set (_metadata[i.first], i.second);
-               }
-
-               for (auto const& i: _enable_metadata) {
-                       if (metadata.find(i.first) == metadata.end()) {
-                               checked_set (i.second, false);
-                       }
-               }
-
-               for (auto const& i: _metadata) {
-                       if (metadata.find(i.first) == metadata.end()) {
-                               checked_set (i.second, wxT(""));
-                       }
-               }
 
                checked_set (_kdm_duration, config->default_kdm_duration().duration);
                switch (config->default_kdm_duration().unit) {
@@ -527,26 +427,11 @@ private:
                config->set_default_kdm_duration (RoughDuration(duration, unit));
        }
 
-       void video_bit_rate_changed()
-       {
-               Config::instance()->set_default_video_bit_rate(_video_bit_rate->GetValue() * 1000000);
-       }
-
        void audio_delay_changed ()
        {
                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 (
-                               locale_convert<int>(string_client_data(_dcp_audio_channels->GetClientObject(s)))
-                               );
-               }
-       }
-
        void directory_changed ()
        {
                Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
@@ -572,29 +457,6 @@ private:
                Config::instance()->set_default_still_length (_still_length->GetValue ());
        }
 
-       void dcp_content_type_changed ()
-       {
-               auto ct = DCPContentType::all ();
-               Config::instance()->set_default_dcp_content_type (ct[_dcp_content_type->GetSelection()]);
-       }
-
-       void standard_changed ()
-       {
-               Config::instance()->set_default_interop (_standard->GetSelection() == 1);
-       }
-
-       void metadata_changed ()
-       {
-               map<string, string> metadata;
-               for (auto const& i: _enable_metadata) {
-                       if (i.second->GetValue()) {
-                               metadata[i.first] = wx_to_std(_metadata[i.first]->GetValue());
-                       }
-               }
-               Config::instance()->set_default_metadata (metadata);
-               setup_sensitivity ();
-       }
-
        void enable_audio_language_toggled()
        {
                setup_sensitivity();
@@ -610,31 +472,11 @@ private:
                }
        }
 
-       void enable_territory_toggled()
-       {
-               setup_sensitivity();
-               territory_changed();
-       }
-
-       void territory_changed()
-       {
-               if (_enable_territory->get()) {
-                       Config::instance()->set_default_territory(_territory->get().get_value_or(dcp::LanguageTag::RegionSubtag("US")));
-               } else {
-                       Config::instance()->unset_default_territory();
-               }
-       }
-
        void setup_sensitivity ()
        {
                _audio_language->enable(_enable_audio_language->get());
-               _territory->enable(_enable_territory->get());
-               for (auto const& i: _enable_metadata) {
-                       _metadata[i.first]->Enable(i.second->GetValue());
-               }
        }
 
-       wxSpinCtrl* _video_bit_rate;
        wxSpinCtrl* _audio_delay;
        wxSpinCtrl* _still_length;
 #ifdef DCPOMATIC_USE_OWN_PICKER
@@ -648,15 +490,8 @@ private:
        wxSpinCtrl* _kdm_duration;
        wxChoice* _kdm_duration_unit;
        CheckBox* _use_isdcf_name_by_default;
-       wxChoice* _dcp_content_type;
-       wxChoice* _dcp_audio_channels;
-       wxChoice* _standard;
        CheckBox* _enable_audio_language;
        LanguageTagWidget* _audio_language;
-       CheckBox* _enable_territory;
-       RegionSubtagWidget* _territory;
-       map<string, CheckBox*> _enable_metadata;
-       map<string, wxTextCtrl*> _metadata;
 };
 
 
@@ -1541,10 +1376,19 @@ private:
                _panel->GetSizer()->Add(table, 1, wxALL | wxEXPAND, _border);
 
                {
-                       add_label_to_sizer(table, _panel, _("Maximum JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+                       add_label_to_sizer(table, _panel, _("Maximum JPEG2000 bit rate"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
                        auto s = new wxBoxSizer(wxHORIZONTAL);
-                       _maximum_video_bit_rate = new wxSpinCtrl(_panel);
-                       s->Add(_maximum_video_bit_rate, 1);
+                       _maximum_j2k_video_bit_rate = new wxSpinCtrl(_panel);
+                       s->Add(_maximum_j2k_video_bit_rate, 1);
+                       add_label_to_sizer(s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxALIGN_CENTRE_VERTICAL);
+                       table->Add(s, 1);
+               }
+
+               {
+                       add_label_to_sizer(table, _panel, _("Maximum MPEG2 bit rate"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+                       auto s = new wxBoxSizer(wxHORIZONTAL);
+                       _maximum_mpeg2_video_bit_rate = new wxSpinCtrl(_panel);
+                       s->Add(_maximum_mpeg2_video_bit_rate, 1);
                        add_label_to_sizer(s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxALIGN_CENTRE_VERTICAL);
                        table->Add(s, 1);
                }
@@ -1559,13 +1403,7 @@ private:
 
                _allow_any_container = new CheckBox(_panel, _("Allow full-frame and non-standard container ratios"));
                table->Add(_allow_any_container, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
-               auto restart = new StaticText(_panel, variant::wx::insert_dcpomatic(_("(restart %s to see all ratios)")));
-               auto font = restart->GetFont();
-               font.SetStyle(wxFONTSTYLE_ITALIC);
-               font.SetPointSize(font.GetPointSize() - 1);
-               restart->SetFont(font);
-               table->Add(restart, 1, wxALIGN_CENTRE_VERTICAL | wxBOTTOM, DCPOMATIC_CHECKBOX_BOTTOM_PAD);
-               restart->SetFont(font);
+               table->AddSpacer(0);
 
                checkbox(_("Allow creation of DCPs with 96kHz audio"), _allow_96khz_audio);
                checkbox(_("Allow mapping to all audio channels"), _use_all_audio_channels);
@@ -1579,8 +1417,10 @@ private:
                        table->Add(s, 1);
                }
 
-               _maximum_video_bit_rate->SetRange(1, 1000);
-               _maximum_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&NonStandardPage::maximum_video_bit_rate_changed, this));
+               _maximum_j2k_video_bit_rate->SetRange(1, 1000);
+               _maximum_j2k_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&NonStandardPage::maximum_j2k_video_bit_rate_changed, this));
+               _maximum_mpeg2_video_bit_rate->SetRange(1, 100);
+               _maximum_mpeg2_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&NonStandardPage::maximum_mpeg2_video_bit_rate_changed, this));
                _allow_any_dcp_frame_rate->bind(&NonStandardPage::allow_any_dcp_frame_rate_changed, this);
                _allow_any_container->bind(&NonStandardPage::allow_any_container_changed, this);
                _allow_96khz_audio->bind(&NonStandardPage::allow_96khz_audio_changed, this);
@@ -1594,7 +1434,8 @@ private:
        {
                auto config = Config::instance();
 
-               checked_set(_maximum_video_bit_rate, config->maximum_video_bit_rate() / 1000000);
+               checked_set(_maximum_j2k_video_bit_rate, config->maximum_video_bit_rate(VideoEncoding::JPEG2000) / 1000000);
+               checked_set(_maximum_mpeg2_video_bit_rate, config->maximum_video_bit_rate(VideoEncoding::MPEG2) / 1000000);
                checked_set(_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate());
                checked_set(_allow_any_container, config->allow_any_container());
                checked_set(_allow_96khz_audio, config->allow_96khz_audio());
@@ -1603,9 +1444,14 @@ private:
                checked_set(_isdcf_name_part_length, config->isdcf_name_part_length());
        }
 
-       void maximum_video_bit_rate_changed()
+       void maximum_j2k_video_bit_rate_changed()
+       {
+               Config::instance()->set_maximum_video_bit_rate(VideoEncoding::JPEG2000, _maximum_j2k_video_bit_rate->GetValue() * 1000000);
+       }
+
+       void maximum_mpeg2_video_bit_rate_changed()
        {
-               Config::instance()->set_maximum_video_bit_rate(_maximum_video_bit_rate->GetValue() * 1000000);
+               Config::instance()->set_maximum_video_bit_rate(VideoEncoding::MPEG2, _maximum_mpeg2_video_bit_rate->GetValue() * 1000000);
        }
 
        void allow_any_dcp_frame_rate_changed()
@@ -1638,7 +1484,8 @@ private:
                Config::instance()->set_isdcf_name_part_length(_isdcf_name_part_length->GetValue());
        }
 
-       wxSpinCtrl* _maximum_video_bit_rate = nullptr;
+       wxSpinCtrl* _maximum_j2k_video_bit_rate = nullptr;
+       wxSpinCtrl* _maximum_mpeg2_video_bit_rate = nullptr;
        CheckBox* _allow_any_dcp_frame_rate = nullptr;
        CheckBox* _allow_any_container = nullptr;
        CheckBox* _allow_96khz_audio = nullptr;