From 71b42c48087a4f05f55166e328d1bea3b2b2228b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Apr 2017 00:42:01 +0100 Subject: [PATCH] Fix mis-merge. --- src/lib/config.cc | 3 --- src/lib/config.h | 3 --- 2 files changed, 6 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)) { diff --git a/src/lib/config.h b/src/lib/config.h index abfdba3dd..2fd36059a 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -698,12 +698,9 @@ private: dcp::NameFormat _kdm_container_name_format; dcp::NameFormat _dcp_metadata_filename_format; dcp::NameFormat _dcp_asset_filename_format; -<<<<<<< 8de6a5d1d054bab25ab0d86bc48442d9d6adb849 bool _jump_to_selected; -======= /** name of a specific sound output stream to use for preview */ boost::optional _sound_output; ->>>>>>> First bits of audio support. /** Singleton instance, or 0 */ static Config* _instance; -- 2.30.2