X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=19e05608c5e7a0116c7b73d62b3ecae6ca03ab67;hb=cf65fc50de34028b463825ec4cd6ab4b5bf46279;hp=46bd390cc8628773edd0e476781c099f016c794f;hpb=924f4edb20d14bc697956254951fb87513cf2e19;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 46bd390cc..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;
 	}
@@ -827,8 +823,6 @@ public:
 
 	void set_cinemas_file (boost::filesystem::path file);
 
-	void set_dkdm_recipients_file (boost::filesystem::path file);
-
 	void set_show_hints_before_make_dcp (bool s) {
 		maybe_set (_show_hints_before_make_dcp, s);
 	}
@@ -995,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);
 	}
@@ -1095,7 +1077,8 @@ public:
 	void save_template (std::shared_ptr<const Film> film, std::string name) const;
 	bool existing_template (std::string name) const;
 	std::list<std::string> templates () const;
-	boost::filesystem::path template_path (std::string name) const;
+	boost::filesystem::path template_read_path (std::string name) const;
+	boost::filesystem::path template_write_path (std::string name) const;
 	void rename_template (std::string old_name, std::string new_name) const;
 	void delete_template (std::string name) const;
 
@@ -1103,7 +1086,8 @@ public:
 	static void drop ();
 	static void restore_defaults ();
 	static bool have_existing (std::string);
-	static boost::filesystem::path config_file ();
+	static boost::filesystem::path config_read_file ();
+	static boost::filesystem::path config_write_file ();
 
 private:
 	Config ();
@@ -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