Remove player activity logging. Fixes #2122.

If I remember right this was for swaroop and I suspect nobody else
is really interested.

2 files changed, 0 insertions, 30 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index bfde74a75..419436995 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -168,7 +168,6 @@ Config::set_defaults ()
 	_image_display = 0;
 	_video_view_type = VIDEO_VIEW_SIMPLE;
 	_respect_kdm_validity_periods = true;
-	_player_activity_log_file = boost::none;
 	_player_debug_log_file = boost::none;
 	_player_content_directory = boost::none;
 	_player_playlist_directory = boost::none;
@@ -535,11 +534,6 @@ try
 		_video_view_type = VIDEO_VIEW_SIMPLE;
 	}
 	_respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(true);
-	/* 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");
@@ -962,10 +956,6 @@ Config::write_config () const
 	}
 	/* [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_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());
diff --git a/src/lib/config.h b/src/lib/config.h
index c9206b139..19e05608c 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -517,10 +517,6 @@ public:
 		return _respect_kdm_validity_periods;
 	}
 
-	boost::optional<boost::filesystem::path> player_activity_log_file () const {
-		return _player_activity_log_file;
-	}
-
 	boost::optional<boost::filesystem::path> player_debug_log_file () const {
 		return _player_debug_log_file;
 	}
@@ -993,18 +989,6 @@ public:
 		maybe_set (_respect_kdm_validity_periods, r);
 	}
 
-	void set_player_activity_log_file (boost::filesystem::path p) {
-		maybe_set (_player_activity_log_file, p);
-	}
-
-	void unset_player_activity_log_file () {
-		if (!_player_activity_log_file) {
-			return;
-		}
-		_player_activity_log_file = boost::none;
-		changed ();
-	}
-
 	void set_player_debug_log_file (boost::filesystem::path p) {
 		maybe_set (_player_debug_log_file, p, PLAYER_DEBUG_LOG);
 	}
@@ -1263,10 +1247,6 @@ private:
 	int _image_display;
 	VideoViewType _video_view_type;
 	bool _respect_kdm_validity_periods;
-	/** Log file containing things the player does (e.g. started, stopped, loaded
-	    playlist etc.)  Does not contain debugging information.
-	*/
-	boost::optional<boost::filesystem::path> _player_activity_log_file;
 	/** Log file containing debug information for the player */
 	boost::optional<boost::filesystem::path> _player_debug_log_file;
 	/** A directory containing DCPs whose contents are presented to the user