diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-26 01:17:56 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-26 01:17:56 +0100 |
| commit | 2c35515c5db7b8e49c17fd4ddfa085393d544f9d (patch) | |
| tree | 0e7596e7887b72a477673bf9acb736b9b0296cff /src/lib | |
| parent | ee2cf80b14e8e78eb46280ba30cdb2f0c10c90a0 (diff) | |
Add empty playlist list and configuration option.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 5 | ||||
| -rw-r--r-- | src/lib/config.h | 17 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index da3ef228a..99115f2d7 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -168,6 +168,7 @@ Config::set_defaults () _respect_kdm_validity_periods = true; _player_log_file = boost::none; _player_content_directory = boost::none; + _player_playlist_directory = boost::none; _player_kdm_directory = boost::none; #ifdef DCPOMATIC_VARIANT_SWAROOP _player_background_image = boost::none; @@ -516,6 +517,7 @@ try _respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(true); _player_log_file = f.optional_string_child("PlayerLogFile"); _player_content_directory = f.optional_string_child("PlayerContentDirectory"); + _player_playlist_directory = f.optional_string_child("PlayerPlaylistDirectory"); _player_kdm_directory = f.optional_string_child("PlayerKDMDirectory"); #ifdef DCPOMATIC_VARIANT_SWAROOP _player_background_image = f.optional_string_child("PlayerBackgroundImage"); @@ -922,6 +924,9 @@ Config::write_config () const if (_player_content_directory) { root->add_child("PlayerContentDirectory")->add_child_text(_player_content_directory->string()); } + if (_player_playlist_directory) { + root->add_child("PlayerPlaylistDirectory")->add_child_text(_player_playlist_directory->string()); + } if (_player_kdm_directory) { root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string()); } diff --git a/src/lib/config.h b/src/lib/config.h index a25dab08a..23286ddb0 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -491,6 +491,10 @@ public: return _player_content_directory; } + boost::optional<boost::filesystem::path> player_playlist_directory () const { + return _player_playlist_directory; + } + boost::optional<boost::filesystem::path> player_kdm_directory () const { return _player_kdm_directory; } @@ -959,6 +963,18 @@ public: changed (PLAYER_CONTENT_DIRECTORY); } + void set_player_playlist_directory (boost::filesystem::path p) { + maybe_set (_player_playlist_directory, p); + } + + void unset_player_playlist_directory () { + if (!_player_playlist_directory) { + return; + } + _player_playlist_directory = boost::none; + changed (); + } + void set_player_kdm_directory (boost::filesystem::path p) { maybe_set (_player_kdm_directory, p); } @@ -1201,6 +1217,7 @@ private: for playback. */ boost::optional<boost::filesystem::path> _player_content_directory; + boost::optional<boost::filesystem::path> _player_playlist_directory; boost::optional<boost::filesystem::path> _player_kdm_directory; #ifdef DCPOMATIC_VARIANT_SWAROOP boost::optional<boost::filesystem::path> _player_background_image; |