X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=3518dc63fc4ea4a62985d03c161d9f260433e6c8;hb=86bbc0981a60ad9ba7b7bdbf28a34f197f83f6cb;hp=e3a34aed3787f0eebc5d40b81fdc2c74725b54ef;hpb=0985598b244ec2b82714a422e5d8381a08c6da35;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index e3a34aed3..3518dc63f 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -79,6 +79,7 @@ public:
 		INTERFACE_COMPLEXITY,
 		PLAYER_CONTENT_DIRECTORY,
 		PLAYER_PLAYLIST_DIRECTORY,
+		PLAYER_DEBUG_LOG,
 		HISTORY,
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		PLAYER_BACKGROUND_IMAGE,
@@ -484,8 +485,12 @@ public:
 		return _respect_kdm_validity_periods;
 	}
 
-	boost::optional<boost::filesystem::path> player_log_file () const {
-		return _player_log_file;
+	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;
 	}
 
 	boost::optional<boost::filesystem::path> player_content_directory () const {
@@ -856,7 +861,9 @@ public:
 	}
 
 	void add_to_history (boost::filesystem::path p);
+	void clean_history ();
 	void add_to_player_history (boost::filesystem::path p);
+	void clean_player_history ();
 
 	void set_jump_to_selected (bool j) {
 		maybe_set (_jump_to_selected, j);
@@ -940,18 +947,30 @@ public:
 		maybe_set (_respect_kdm_validity_periods, r);
 	}
 
-	void set_player_log_file (boost::filesystem::path p) {
-		maybe_set (_player_log_file, p);
+	void set_player_activity_log_file (boost::filesystem::path p) {
+		maybe_set (_player_activity_log_file, p);
 	}
 
-	void unset_player_log_file () {
-		if (!_player_log_file) {
+	void unset_player_activity_log_file () {
+		if (!_player_activity_log_file) {
 			return;
 		}
-		_player_log_file = boost::none;
+		_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);
+	}
+
+	void unset_player_debug_log_file () {
+		if (!_player_debug_log_file) {
+			return;
+		}
+		_player_debug_log_file = boost::none;
+		changed (PLAYER_DEBUG_LOG);
+	}
+
 	void set_player_content_directory (boost::filesystem::path p) {
 		maybe_set (_player_content_directory, p, PLAYER_CONTENT_DIRECTORY);
 	}
@@ -1082,6 +1101,7 @@ private:
 	boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
 	boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;
 	void add_to_history_internal (std::vector<boost::filesystem::path>& h, boost::filesystem::path p);
+	void clean_history_internal (std::vector<boost::filesystem::path>& h);
 	void backup ();
 
 	template <class T>
@@ -1227,7 +1247,12 @@ private:
 	PlayerMode _player_mode;
 	int _image_display;
 	bool _respect_kdm_validity_periods;
-	boost::optional<boost::filesystem::path> _player_log_file;
+	/** 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
 	    in the dual-screen player mode.  DCPs on the list can be loaded
 	    for playback.