diff options
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 4376ff057..af0853bed 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -309,11 +309,8 @@ try _kdm_filename_format = dcp::NameFormat (f.optional_string_child("KDMFilenameFormat").get_value_or ("KDM %f %c %s")); _dcp_metadata_filename_format = dcp::NameFormat (f.optional_string_child("DCPMetadataFilenameFormat").get_value_or ("%t")); _dcp_asset_filename_format = dcp::NameFormat (f.optional_string_child("DCPAssetFilenameFormat").get_value_or ("%t")); -<<<<<<< 8de6a5d1d054bab25ab0d86bc48442d9d6adb849 _jump_to_selected = f.optional_bool_child("JumpToSelected").get_value_or (true); -======= _sound_output = f.optional_string_child("SoundOutput"); ->>>>>>> First bits of audio support. /* Replace any cinemas from config.xml with those from the configured file */ if (boost::filesystem::exists (_cinemas_file)) { |