diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-07 23:36:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-07 23:36:40 +0100 |
| commit | 5dc2dbdb6639f8d617a40209ad603d2a38f9df2a (patch) | |
| tree | 849db948bfed659df5a9f5bfb2bdb8519c313de6 /src/lib/config.cc | |
| parent | a4d3b0b6b1069b08fff0559f63d73bb7353256bd (diff) | |
| parent | 38fd8d2d230a239079ffdf3e10a48833ade6e8c5 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 1f5a25ae4..114fc5c27 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -67,7 +67,7 @@ Config::Config () , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750"))) , _allow_any_dcp_frame_rate (false) , _default_still_length (10) - , _default_scale (Ratio::from_id ("185")) + , _default_scale (VideoContentScale (Ratio::from_id ("185"))) , _default_container (Ratio::from_id ("185")) , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST")) , _default_j2k_bandwidth (100000000) @@ -147,7 +147,7 @@ Config::read () c = f.optional_string_child ("DefaultScale"); if (c) { - _default_scale = Ratio::from_id (c.get ()); + _default_scale = VideoContentScale::from_id (c.get ()); } c = f.optional_string_child ("DefaultContainer"); @@ -329,9 +329,7 @@ Config::write () const if (_language) { root->add_child("Language")->add_child_text (_language.get()); } - if (_default_scale) { - root->add_child("DefaultScale")->add_child_text (_default_scale->id ()); - } + root->add_child("DefaultScale")->add_child_text (_default_scale.id ()); if (_default_container) { root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } |