X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;fp=src%2Flib%2Fconfig.cc;h=18955a8969283f618eaebd05ed8aaddd15f01435;hb=186654cc20ef302abed1a2ddfa01fc1fa3af81fa;hp=ebb6ece931f0bed3899e734f17c0baefdb2f4dad;hpb=15a83d720780d58f905d40f8493cdcb86596eaee;p=dcpomatic.git 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 (); _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("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 DefaultContainer 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 (FTR, SHR, TLR, TST, XSN, RTG, TSR, POL,