diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-11 01:50:01 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-11 22:02:49 +0200 |
| commit | 186654cc20ef302abed1a2ddfa01fc1fa3af81fa (patch) | |
| tree | 2e656c516fc61e25df13b7b7d443e56006b394c3 /src/lib | |
| parent | 15a83d720780d58f905d40f8493cdcb86596eaee (diff) | |
Remove now-unused default-scale-to config option.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 12 | ||||
| -rw-r--r-- | src/lib/config.h | 9 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index ebb6ece93..18955a896 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -99,7 +99,6 @@ Config::set_defaults () _language = optional<string> (); _default_still_length = 10; _default_container = Ratio::from_id ("185"); - _default_scale_to = 0; _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR"); _default_dcp_audio_channels = 6; _default_j2k_bandwidth = 150000000; @@ -309,11 +308,6 @@ try _default_container = Ratio::from_id ("185"); } - c = f.optional_string_child ("DefaultScaleTo"); - if (c) { - _default_scale_to = Ratio::from_id (c.get ()); - } - _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); @@ -719,12 +713,6 @@ Config::write_config () const */ root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } - if (_default_scale_to) { - /* [XML:opt] DefaultScaleTo ID of default ratio to scale content to when creating new films - (see <code>DefaultContainer</code> for IDs). - */ - root->add_child("DefaultScaleTo")->add_child_text (_default_scale_to->id ()); - } if (_default_dcp_content_type) { /* [XML:opt] DefaultDCPContentType Default content type ot 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>, diff --git a/src/lib/config.h b/src/lib/config.h index f54ca3814..23f7ce0b3 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -186,10 +186,6 @@ public: return _default_container; } - Ratio const * default_scale_to () const { - return _default_scale_to; - } - DCPContentType const * default_dcp_content_type () const { return _default_dcp_content_type; } @@ -686,10 +682,6 @@ public: maybe_set (_default_container, c); } - void set_default_scale_to (Ratio const * c) { - maybe_set (_default_scale_to, c); - } - void set_default_dcp_content_type (DCPContentType const * t) { maybe_set (_default_dcp_content_type, t); } @@ -1233,7 +1225,6 @@ private: /** Default length of still image content (seconds) */ int _default_still_length; Ratio const * _default_container; - Ratio const * _default_scale_to; DCPContentType const * _default_dcp_content_type; int _default_dcp_audio_channels; std::string _dcp_issuer; |