Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index da3ef228a243489046d94e56d587131597b236e3..b64690aadf4df86569b3e6a047d223038c1fbbfb 100644 (file)
--- 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;
@@ -232,7 +233,7 @@ void
 Config::read ()
 try
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
+#if defined(DCPOMATIC_VARIANT_SWAROOP) && defined(DCPOMATIC_LINUX)
        if (geteuid() == 0) {
                /* Take ownership of the config file if we're root */
                chown (config_file().string().c_str(), 0, 0);
@@ -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());
        }