diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-27 11:25:21 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-27 11:25:21 +0100 |
| commit | f76453d0b78e5b71abbd9b4fcfda9e8eb0b61ad0 (patch) | |
| tree | 2e486b2c2724d6a2d3ec10c6f0855e82aa7fbf5b /src/lib | |
| parent | f169ad6ed7d4061c40802c7dea2e1abb04cdeb4b (diff) | |
Untested watermarking.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 5 | ||||
| -rw-r--r-- | src/lib/config.h | 18 |
2 files changed, 23 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index abb775be8..d7fd74449 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -172,6 +172,7 @@ Config::set_defaults () #ifdef DCPOMATIC_VARIANT_SWAROOP _player_background_image = boost::none; _kdm_server_url = "http://localhost:8000/{CPL}"; + _player_watermark = boost::none; #endif _allowed_dcp_frame_rates.clear (); @@ -508,6 +509,7 @@ try #ifdef DCPOMATIC_VARIANT_SWAROOP _player_background_image = f.optional_string_child("PlayerBackgroundImage"); _kdm_server_url = f.optional_string_child("KDMServerURL").get_value_or("http://localhost:8000/{CPL}"); + _player_watermark = f.optional_string_child("PlayerWatermark"); #endif /* Replace any cinemas from config.xml with those from the configured file */ @@ -911,6 +913,9 @@ Config::write_config () const root->add_child("PlayerBackgroundImage")->add_child_text(_player_background_image->string()); } root->add_child("KDMServerURL")->add_child_text(_kdm_server_url); + if (_player_watermark) { + root->add_child("PlayerWatermark")->add_child_text(_player_watermark->string()); + } #endif try { diff --git a/src/lib/config.h b/src/lib/config.h index 378272ff0..bcc46f8fa 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -79,6 +79,7 @@ public: PLAYER_DCP_DIRECTORY, #ifdef DCPOMATIC_VARIANT_SWAROOP PLAYER_BACKGROUND_IMAGE, + PLAYER_WATERMARK, #endif OTHER }; @@ -501,6 +502,10 @@ public: std::string kdm_server_url () const { return _kdm_server_url; } + + boost::optional<boost::filesystem::path> player_watermark () const { + return _player_watermark; + } #endif /* SET (mostly) */ @@ -965,6 +970,18 @@ public: void set_kdm_server_url (std::string s) { maybe_set (_kdm_server_url, s); } + + void set_player_watermark (boost::filesystem::path p) { + maybe_set (_player_watermark, p, PLAYER_WATERMARK); + } + + void unset_player_watermark () { + if (!_player_watermark) { + return; + } + _player_watermark = boost::none; + changed (PLAYER_WATERMARK); + } #endif void changed (Property p = OTHER); @@ -1162,6 +1179,7 @@ private: #ifdef DCPOMATIC_VARIANT_SWAROOP boost::optional<boost::filesystem::path> _player_background_image; std::string _kdm_server_url; + boost::optional<boost::filesystem::path> _player_watermark; #endif static int const _current_version; |