More player debugging for butler video-full states.

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 99ed74b29bc27d53c27fb0cfcecf36dfd38e6580..bf4b495523cd10433e3b80549fd5ac7db67ff279 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -168,7 +168,8 @@ Config::set_defaults ()
        _player_mode = PLAYER_MODE_WINDOW;
        _image_display = 0;
        _respect_kdm_validity_periods = true;
-       _player_log_file = boost::none;
+       _player_activity_log_file = boost::none;
+       _player_debug_log_file = boost::none;
        _player_content_directory = boost::none;
        _player_playlist_directory = boost::none;
        _player_kdm_directory = boost::none;
@@ -550,7 +551,12 @@ try
 
        _image_display = f.optional_number_child<int>("ImageDisplay").get_value_or(0);
        _respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(true);
-       _player_log_file = f.optional_string_child("PlayerLogFile");
+       /* PlayerLogFile is old name */
+       _player_activity_log_file = f.optional_string_child("PlayerLogFile");
+       if (!_player_activity_log_file) {
+               _player_activity_log_file = f.optional_string_child("PlayerActivityLogFile");
+       }
+       _player_debug_log_file = f.optional_string_child("PlayerDebugLogFile");
        _player_content_directory = f.optional_string_child("PlayerContentDirectory");
        _player_playlist_directory = f.optional_string_child("PlayerPlaylistDirectory");
        _player_kdm_directory = f.optional_string_child("PlayerKDMDirectory");
@@ -989,20 +995,24 @@ Config::write_config () const
        root->add_child("ImageDisplay")->add_child_text(raw_convert<string>(_image_display));
        /* [XML] RespectKDMValidityPeriods 1 to refuse to use KDMs that are out of date, 0 to ignore KDM dates. */
        root->add_child("RespectKDMValidityPeriods")->add_child_text(_respect_kdm_validity_periods ? "1" : "0");
-       if (_player_log_file) {
-               /* [XML] PlayerLogFile Filename to use for player logs */
-               root->add_child("PlayerLogFile")->add_child_text(_player_log_file->string());
+       if (_player_activity_log_file) {
+               /* [XML] PlayerLogFile Filename to use for player activity logs (e.g starting, stopping, playlist loads) */
+               root->add_child("PlayerActivityLogFile")->add_child_text(_player_activity_log_file->string());
+       }
+       if (_player_debug_log_file) {
+               /* [XML] PlayerLogFile Filename to use for player debug logs */
+               root->add_child("PlayerDebugLogFile")->add_child_text(_player_debug_log_file->string());
        }
        if (_player_content_directory) {
-               /* [XML] PlayerContentDirectory Filename to use for player content in the dual-screen mode. */
+               /* [XML] PlayerContentDirectory Directory to use for player content in the dual-screen mode. */
                root->add_child("PlayerContentDirectory")->add_child_text(_player_content_directory->string());
        }
        if (_player_playlist_directory) {
-               /* [XML] PlayerPlaylistDirectory Filename to use for player playlists in the dual-screen mode. */
+               /* [XML] PlayerPlaylistDirectory Directory to use for player playlists in the dual-screen mode. */
                root->add_child("PlayerPlaylistDirectory")->add_child_text(_player_playlist_directory->string());
        }
        if (_player_kdm_directory) {
-               /* [XML] PlayerKDMDirectory Filename to use for player KDMs in the dual-screen mode. */
+               /* [XML] PlayerKDMDirectory Directory to use for player KDMs in the dual-screen mode. */
                root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string());
        }
 #ifdef DCPOMATIC_VARIANT_SWAROOP