diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-11 00:04:02 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-11 00:04:02 +0000 |
| commit | 58f0530b1687673ea6e24a083063c3fdf2bff0b2 (patch) | |
| tree | 1f76acad0a2877e527c936f754dde16eaf2d768e /src/lib/config.cc | |
| parent | 985a83ffbf251db481150221914ef74fbfe549b2 (diff) | |
Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale and use a scale guessed from the content's size and sample aspect ratio).
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 79ab4e9a3..5f48262fb 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -67,7 +67,6 @@ Config::Config () , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750"))) , _allow_any_dcp_frame_rate (false) , _default_still_length (10) - , _default_scale (VideoContentScale (Ratio::from_id ("185"))) , _default_container (Ratio::from_id ("185")) , _default_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")) , _default_j2k_bandwidth (100000000) @@ -148,11 +147,6 @@ Config::read () _language = f.optional_string_child ("Language"); - c = f.optional_string_child ("DefaultScale"); - if (c) { - _default_scale = VideoContentScale::from_id (c.get ()); - } - c = f.optional_string_child ("DefaultContainer"); if (c) { _default_container = Ratio::from_id (c.get ()); @@ -331,7 +325,6 @@ Config::write () const if (_language) { root->add_child("Language")->add_child_text (_language.get()); } - root->add_child("DefaultScale")->add_child_text (_default_scale.id ()); if (_default_container) { root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } |