diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-08 00:42:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | 71b42c48087a4f05f55166e328d1bea3b2b2228b (patch) | |
| tree | b55a56ba79e7124dc8c269080173aa1e08a306e4 /src/lib | |
| parent | 90c447e9200b9eef0f542b21fab1d0d9eebab733 (diff) | |
Fix mis-merge.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 3 | ||||
| -rw-r--r-- | src/lib/config.h | 3 |
2 files changed, 0 insertions, 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<std::string> _sound_output; ->>>>>>> First bits of audio support. /** Singleton instance, or 0 */ static Config* _instance; |