Rename player DCP directory to player content; ignore failures to load directories which are not DCPs from the player content directory.

2 files changed, 14 insertions, 14 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index ede0b1059..da3ef228a 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -167,7 +167,7 @@ Config::set_defaults ()
 	_image_display = 0;
 	_respect_kdm_validity_periods = true;
 	_player_log_file = boost::none;
-	_player_dcp_directory = boost::none;
+	_player_content_directory = boost::none;
 	_player_kdm_directory = boost::none;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	_player_background_image = boost::none;
@@ -515,7 +515,7 @@ 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");
-	_player_dcp_directory = f.optional_string_child("PlayerDCPDirectory");
+	_player_content_directory = f.optional_string_child("PlayerContentDirectory");
 	_player_kdm_directory = f.optional_string_child("PlayerKDMDirectory");
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	_player_background_image = f.optional_string_child("PlayerBackgroundImage");
@@ -919,8 +919,8 @@ Config::write_config () const
 	if (_player_log_file) {
 		root->add_child("PlayerLogFile")->add_child_text(_player_log_file->string());
 	}
-	if (_player_dcp_directory) {
-		root->add_child("PlayerDCPDirectory")->add_child_text(_player_dcp_directory->string());
+	if (_player_content_directory) {
+		root->add_child("PlayerContentDirectory")->add_child_text(_player_content_directory->string());
 	}
 	if (_player_kdm_directory) {
 		root->add_child("PlayerKDMDirectory")->add_child_text(_player_kdm_directory->string());
diff --git a/src/lib/config.h b/src/lib/config.h
index 011906a41..a25dab08a 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -77,7 +77,7 @@ public:
 		SOUND,
 		SOUND_OUTPUT,
 		INTERFACE_COMPLEXITY,
-		PLAYER_DCP_DIRECTORY,
+		PLAYER_CONTENT_DIRECTORY,
 		HISTORY,
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 		PLAYER_BACKGROUND_IMAGE,
@@ -487,8 +487,8 @@ public:
 		return _player_log_file;
 	}
 
-	boost::optional<boost::filesystem::path> player_dcp_directory () const {
-		return _player_dcp_directory;
+	boost::optional<boost::filesystem::path> player_content_directory () const {
+		return _player_content_directory;
 	}
 
 	boost::optional<boost::filesystem::path> player_kdm_directory () const {
@@ -947,16 +947,16 @@ public:
 		changed ();
 	}
 
-	void set_player_dcp_directory (boost::filesystem::path p) {
-		maybe_set (_player_dcp_directory, p, PLAYER_DCP_DIRECTORY);
+	void set_player_content_directory (boost::filesystem::path p) {
+		maybe_set (_player_content_directory, p, PLAYER_CONTENT_DIRECTORY);
 	}
 
-	void unset_player_dcp_directory () {
-		if (!_player_dcp_directory) {
+	void unset_player_content_directory () {
+		if (!_player_content_directory) {
 			return;
 		}
-		_player_dcp_directory = boost::none;
-		changed (PLAYER_DCP_DIRECTORY);
+		_player_content_directory = boost::none;
+		changed (PLAYER_CONTENT_DIRECTORY);
 	}
 
 	void set_player_kdm_directory (boost::filesystem::path p) {
@@ -1200,7 +1200,7 @@ private:
 	    in the dual-screen player mode.  DCPs on the list can be loaded
 	    for playback.
 	*/
-	boost::optional<boost::filesystem::path> _player_dcp_directory;
+	boost::optional<boost::filesystem::path> _player_content_directory;
 	boost::optional<boost::filesystem::path> _player_kdm_directory;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
 	boost::optional<boost::filesystem::path> _player_background_image;