diff options
| author | Carl Hetherington <cth@carlh.net> | 2017-03-15 23:39:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2017-04-19 23:04:32 +0100 |
| commit | fe99d14e3047e9302e94db372923c92291016f1c (patch) | |
| tree | 7a826e545927e576794af532fb403506f33603a7 /src/lib/config.cc | |
| parent | 81301e260bad6944a75b3d20c1be4f2ff9929db7 (diff) | |
First bits of audio support.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 79486c602..4376ff057 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -116,6 +116,7 @@ Config::set_defaults () _dcp_metadata_filename_format = dcp::NameFormat ("%t"); _dcp_asset_filename_format = dcp::NameFormat ("%t"); _jump_to_selected = true; + _sound_output = optional<string> (); _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -308,7 +309,11 @@ 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)) { @@ -476,7 +481,13 @@ 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 ()); |