diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-13 01:08:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-13 01:08:14 +0000 |
| commit | 08feee25150ff15bad67087c80e44ba21e6ebd0d (patch) | |
| tree | a49bdf7fd322f12770a3ed3aa83f8c9414fc0d29 /src | |
| parent | b17a5963f9c79e3e99890f32129105dd49fb0c29 (diff) | |
Make Config::read() fallback match Config::set_defaults() for
_default_dcp_content_type.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 16df3779f..503ca9c5f 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -253,11 +253,7 @@ try _default_scale_to = Ratio::from_id (c.get ()); } - c = f.optional_string_child ("DefaultDCPContentType"); - if (c) { - _default_dcp_content_type = DCPContentType::from_isdcf_name (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); if (f.optional_string_child ("DCPMetadataIssuer")) { |