diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-04-08 00:45:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | ad0c51a63b40922c900ccc03c3b6417874a8c981 (patch) | |
| tree | c2360ac426e868a16fa8a60330d6fd33f75c1ee1 /src/lib | |
| parent | 71b42c48087a4f05f55166e328d1bea3b2b2228b (diff) | |
Another mis-merge.
Diffstat (limited to 'src/lib')
| -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 af0853bed..b099cbc85 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -478,13 +478,10 @@ Config::write_config () const root->add_child("KDMContainerNameFormat")->add_child_text (_kdm_container_name_format.specification ()); root->add_child("DCPMetadataFilenameFormat")->add_child_text (_dcp_metadata_filename_format.specification ()); root->add_child("DCPAssetFilenameFormat")->add_child_text (_dcp_asset_filename_format.specification ()); -<<<<<<< 8de6a5d1d054bab25ab0d86bc48442d9d6adb849 root->add_child("JumpToSelected")->add_child_text (_jump_to_selected ? "1" : "0"); -======= if (_sound_output) { root->add_child("SoundOutput")->add_child_text (_sound_output.get()); } ->>>>>>> First bits of audio support. try { doc.write_to_file_formatted (path("config.xml").string ()); |