From 8bf885d308586842bb3195745cb40480a91793a2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 18 Sep 2023 00:36:46 +0200 Subject: [PATCH] Remove default standard setting (already taken from template). --- src/lib/config.cc | 4 ---- src/lib/config.h | 9 --------- src/lib/film.cc | 2 +- src/wx/full_config_dialog.cc | 15 --------------- test/test.cc | 1 - 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/lib/config.cc b/src/lib/config.cc index f74c6da1f..ac9a4447a 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -106,7 +106,6 @@ Config::set_defaults () _language = optional (); _default_still_length = 10; _default_audio_delay = 0; - _default_interop = false; _default_metadata.clear (); _upload_after_make_dcp = false; _mail_server = ""; @@ -355,7 +354,6 @@ try _default_still_length = f.optional_number_child("DefaultStillLength").get_value_or (10); _default_audio_delay = f.optional_number_child("DefaultAudioDelay").get_value_or (0); - _default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false); try { auto al = f.optional_string_child("DefaultAudioLanguage"); @@ -769,8 +767,6 @@ Config::write_config () const root->add_child("DefaultStillLength")->add_child_text (raw_convert (_default_still_length)); /* [XML] DefaultAudioDelay Default delay to apply to audio (positive moves audio later) in milliseconds. */ root->add_child("DefaultAudioDelay")->add_child_text (raw_convert (_default_audio_delay)); - /* [XML] DefaultInterop 1 to default new films to Interop, 0 for SMPTE. */ - root->add_child("DefaultInterop")->add_child_text (_default_interop ? "1" : "0"); if (_default_audio_language) { /* [XML] DefaultAudioLanguage Default audio language to use for new films */ root->add_child("DefaultAudioLanguage")->add_child_text(_default_audio_language->to_string()); diff --git a/src/lib/config.h b/src/lib/config.h index b7eef6827..93c2b9cde 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -223,10 +223,6 @@ public: return _default_audio_delay; } - bool default_interop () const { - return _default_interop; - } - boost::optional default_audio_language() const { return _default_audio_language; } @@ -758,10 +754,6 @@ public: maybe_set (_default_audio_delay, d); } - void set_default_interop (bool i) { - maybe_set (_default_interop, i); - } - void set_default_audio_language(dcp::LanguageTag tag) { maybe_set(_default_audio_language, tag); } @@ -1313,7 +1305,6 @@ private: std::string _dcp_product_version; std::string _dcp_j2k_comment; int _default_audio_delay; - bool _default_interop; boost::optional _default_audio_language; boost::optional _default_territory; std::map _default_metadata; diff --git a/src/lib/film.cc b/src/lib/film.cc index ba8de10bd..542dbfa74 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -165,7 +165,7 @@ Film::Film (optional dir) , _audio_channels(8) , _three_d (false) , _sequence (true) - , _interop (Config::instance()->default_interop ()) + , _interop(false) , _limit_to_smpte_bv20(false) , _audio_processor (0) , _reel_type (ReelType::SINGLE) diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index f3d6977ab..663f4baeb 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -313,10 +313,6 @@ 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-")); @@ -380,10 +376,6 @@ private: _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); } @@ -409,7 +401,6 @@ private: _kdm_type->set (config->default_kdm_type()); checked_set (_use_isdcf_name_by_default, config->use_isdcf_name_by_default()); 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(dal)); checked_set(_audio_language, dal ? dal : boost::none); @@ -511,11 +502,6 @@ private: Config::instance()->set_default_still_length (_still_length->GetValue ()); } - void standard_changed () - { - Config::instance()->set_default_interop (_standard->GetSelection() == 1); - } - void metadata_changed () { map metadata; @@ -580,7 +566,6 @@ private: wxSpinCtrl* _kdm_duration; wxChoice* _kdm_duration_unit; CheckBox* _use_isdcf_name_by_default; - wxChoice* _standard; CheckBox* _enable_audio_language; LanguageTagWidget* _audio_language; CheckBox* _enable_territory; diff --git a/test/test.cc b/test/test.cc index ca911c150..45e12690f 100644 --- a/test/test.cc +++ b/test/test.cc @@ -118,7 +118,6 @@ setup_test_config () Config::instance()->set_server_encoding_threads (1); Config::instance()->set_server_port_base (61921); Config::instance()->set_default_audio_delay (0); - Config::instance()->set_default_interop (false); Config::instance()->set_default_still_length (10); Config::instance()->set_log_types ( LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | -- 2.30.2