summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-26 13:51:05 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-26 13:51:05 +0100
commitbe3ec98436ca28554d9414f5d5a2e3fa18846f3d (patch)
tree93cff812499cd1f95a94764a735984c6f2bb2dd5 /src/lib
parent76a2964f5b1a6f6cf4ead13895ae9509029cc248 (diff)
Add background image configuration to swaroop variant.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/config.cc11
-rw-r--r--src/lib/config.h23
2 files changed, 34 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5e953382d..b61b1d054 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -169,6 +169,9 @@ Config::set_defaults ()
_player_log_file = boost::none;
_player_dcp_directory = boost::none;
_player_kdm_directory = boost::none;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _player_background_image = boost::none;
+#endif
_allowed_dcp_frame_rates.clear ();
_allowed_dcp_frame_rates.push_back (24);
@@ -501,6 +504,9 @@ try
_player_log_file = f.optional_string_child("PlayerLogFile");
_player_dcp_directory = f.optional_string_child("PlayerDCPDirectory");
_player_kdm_directory = f.optional_string_child("PlayerKDMDirectory");
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ _player_background_image = f.optional_string_child("PlayerBackgroundImage");
+#endif
/* Replace any cinemas from config.xml with those from the configured file */
if (boost::filesystem::exists (_cinemas_file)) {
@@ -898,6 +904,11 @@ Config::write_config () const
if (_player_kdm_directory) {
root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string());
}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ if (_player_background_image) {
+ root->add_child("PlayerBackgroundImage")->add_child_text(_player_background_image->string());
+ }
+#endif
try {
doc.write_to_file_formatted(config_file().string());
diff --git a/src/lib/config.h b/src/lib/config.h
index 60e85c5f3..04f521575 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -490,6 +490,12 @@ public:
return _player_kdm_directory;
}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ boost::optional<boost::filesystem::path> player_background_image () const {
+ return _player_background_image;
+ }
+#endif
+
/* SET (mostly) */
void set_master_encoding_threads (int n) {
@@ -936,6 +942,20 @@ public:
changed ();
}
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ void set_player_background_image (boost::filesystem::path p) {
+ maybe_set (_player_background_image, p);
+ }
+
+ void unset_player_background_image () {
+ if (!_player_background_image) {
+ return;
+ }
+ _player_background_image = boost::none;
+ changed ();
+ }
+#endif
+
void changed (Property p = OTHER);
boost::signals2::signal<void (Property)> Changed;
/** Emitted if read() failed on an existing Config file. There is nothing
@@ -1128,6 +1148,9 @@ private:
*/
boost::optional<boost::filesystem::path> _player_dcp_directory;
boost::optional<boost::filesystem::path> _player_kdm_directory;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ boost::optional<boost::filesystem::path> _player_background_image;
+#endif
static int const _current_version;