X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=8ddc0367de9b9a0290b09b3058b60e8c8ec2a8ca;hb=2538ac5a15b56880438018c8ab17d8571fe76812;hp=fc5d820f93f663d677c57b080f4052e646e1b3fa;hpb=e571e208d540a5bb6dafa49a8e91cb0428931abb;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index fc5d820f9..8ddc0367d 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -76,6 +76,10 @@ public: SOUND, SOUND_OUTPUT, INTERFACE_COMPLEXITY, + PLAYER_DCP_DIRECTORY, +#ifdef DCPOMATIC_VARIANT_SWAROOP + PLAYER_BACKGROUND_IMAGE, +#endif OTHER }; @@ -485,6 +489,32 @@ public: return _player_dcp_directory; } + boost::optional player_kdm_directory () const { + return _player_kdm_directory; + } + +#ifdef DCPOMATIC_VARIANT_SWAROOP + boost::optional player_background_image () const { + return _player_background_image; + } + + std::string kdm_server_url () const { + return _kdm_server_url; + } + + std::string player_watermark_theatre () const { + return _player_watermark_theatre; + } + + int player_watermark_period () const { + return _player_watermark_period; + } + + int player_watermark_duration () const { + return _player_watermark_duration; + } +#endif + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -908,7 +938,7 @@ public: } void set_player_dcp_directory (boost::filesystem::path p) { - maybe_set (_player_dcp_directory, p); + maybe_set (_player_dcp_directory, p, PLAYER_DCP_DIRECTORY); } void unset_player_dcp_directory () { @@ -916,9 +946,51 @@ public: return; } _player_dcp_directory = boost::none; + changed (PLAYER_DCP_DIRECTORY); + } + + void set_player_kdm_directory (boost::filesystem::path p) { + maybe_set (_player_kdm_directory, p); + } + + void unset_player_kdm_directory () { + if (!_player_kdm_directory) { + return; + } + _player_kdm_directory = boost::none; changed (); } +#ifdef DCPOMATIC_VARIANT_SWAROOP + void set_player_background_image (boost::filesystem::path p) { + maybe_set (_player_background_image, p, PLAYER_BACKGROUND_IMAGE); + } + + void unset_player_background_image () { + if (!_player_background_image) { + return; + } + _player_background_image = boost::none; + changed (PLAYER_BACKGROUND_IMAGE); + } + + void set_kdm_server_url (std::string s) { + maybe_set (_kdm_server_url, s); + } + + void set_player_watermark_theatre (std::string p) { + maybe_set (_player_watermark_theatre, p); + } + + void set_player_watermark_period (int minutes) { + maybe_set (_player_watermark_period, minutes); + } + + void set_player_watermark_duration (int milliseconds) { + maybe_set (_player_watermark_duration, milliseconds); + } +#endif + void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing @@ -937,6 +1009,7 @@ public: void write_cinemas () const; void link (boost::filesystem::path new_file) const; void copy_and_link (boost::filesystem::path new_file) const; + bool have_write_permission () const; void save_template (boost::shared_ptr film, std::string name) const; bool existing_template (std::string name) const; @@ -1110,6 +1183,14 @@ private: for playback. */ boost::optional _player_dcp_directory; + boost::optional _player_kdm_directory; +#ifdef DCPOMATIC_VARIANT_SWAROOP + boost::optional _player_background_image; + std::string _kdm_server_url; + std::string _player_watermark_theatre; + int _player_watermark_period; + int _player_watermark_duration; +#endif static int const _current_version;