diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-11-23 00:01:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-11-29 00:15:02 +0100 |
| commit | da822af56c5e4acab361b8531fb75a1dcb4b110e (patch) | |
| tree | d9a55547f801ef67e8091de7d878181f25a65d72 /src/lib/config.cc | |
| parent | 34435f5733bac96df052b62661a981d091787704 (diff) | |
Remove default container configuration option.
I think this is basically useless now that DoM guesses a good container
when the first video is added. It made more sense before we did that.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 6984c4064..235bace7b 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -106,7 +106,6 @@ Config::set_defaults () _show_experimental_audio_processors = false; _language = optional<string> (); _default_still_length = 10; - _default_container = Ratio::from_id ("185"); _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR"); _default_dcp_audio_channels = 6; _default_j2k_bandwidth = 150000000; @@ -334,16 +333,6 @@ try _language = f.optional_string_child ("Language"); - auto c = f.optional_string_child ("DefaultContainer"); - if (c) { - _default_container = Ratio::from_id (c.get ()); - } - - if (_default_container && !_default_container->used_for_container()) { - Warning (_("Your default container is not valid and has been changed to Flat (1.85:1)")); - _default_container = Ratio::from_id ("185"); - } - _default_dcp_content_type = DCPContentType::from_isdcf_name(f.optional_string_child("DefaultDCPContentType").get_value_or("FTR")); _default_dcp_audio_channels = f.optional_number_child<int>("DefaultDCPAudioChannels").get_value_or (6); @@ -735,13 +724,6 @@ Config::write_config () const /* [XML:opt] Language Language to use in the GUI e.g. <code>fr_FR</code>. */ root->add_child("Language")->add_child_text (_language.get()); } - if (_default_container) { - /* [XML:opt] DefaultContainer ID of default container - to use when creating new films (<code>185</code>,<code>239</code> or - <code>190</code>). - */ - root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); - } if (_default_dcp_content_type) { /* [XML:opt] DefaultDCPContentType Default content type to use when creating new films (<code>FTR</code>, <code>SHR</code>, <code>TLR</code>, <code>TST</code>, <code>XSN</code>, <code>RTG</code>, <code>TSR</code>, <code>POL</code>, |