X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=eb13112d2556d101533cdea9e85d5a575be41274;hb=23f2dc3bfb94930b938281c7f1e5663b761fa508;hp=6e06f78e4b85e42d6f8c146aa89fa6a3629a7e3a;hpb=2538ac5a15b56880438018c8ab17d8571fe76812;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 6e06f78e4..eb13112d2 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -522,6 +522,9 @@ try _player_watermark_theatre = f.optional_string_child("PlayerWatermarkTheatre").get_value_or(""); _player_watermark_period = f.optional_number_child("PlayerWatermarkPeriod").get_value_or(1); _player_watermark_duration = f.optional_number_child("PlayerWatermarkDuration").get_value_or(150); + BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("RequiredMonitor")) { + _required_monitors.push_back(Monitor(i)); + } #endif /* Replace any cinemas from config.xml with those from the configured file */ @@ -928,6 +931,9 @@ Config::write_config () const root->add_child("PlayerWatermarkTheatre")->add_child_text(_player_watermark_theatre); root->add_child("PlayerWatermarkPeriod")->add_child_text(raw_convert(_player_watermark_period)); root->add_child("PlayerWatermarkDuration")->add_child_text(raw_convert(_player_watermark_duration)); + BOOST_FOREACH (Monitor i, _required_monitors) { + i.as_xml(root->add_child("RequiredMonitor")); + } #endif try { @@ -1077,7 +1083,7 @@ Config::add_to_history_internal (vector& h, boost::file h.pop_back (); } - changed (); + changed (HISTORY); } bool