X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=581620f832846f8a2f8e7418478fb43666dbc5ab;hb=a9dde34b8772ef8b985af067e2ff709be4e3cab6;hp=fdd0516629c9c268153551c30456fec0991850b8;hpb=5e2b926c116bbce2800fe3459e5a654101355482;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index fdd051662..581620f83 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -24,7 +24,6 @@
 #include "types.h"
 #include "log.h"
 #include "dcp_content_type.h"
-#include "cinema_sound_processor.h"
 #include "colour_conversion.h"
 #include "cinema.h"
 #include "util.h"
@@ -93,9 +92,9 @@ Config::set_defaults ()
 	_tms_path = ".";
 	_tms_user = "";
 	_tms_password = "";
-	_cinema_sound_processor = CinemaSoundProcessor::from_id (N_("dolby_cp750"));
 	_allow_any_dcp_frame_rate = false;
 	_allow_any_container = false;
+	_show_experimental_audio_processors = false;
 	_language = optional<string> ();
 	_default_still_length = 10;
 	_default_container = Ratio::from_id ("185");
@@ -293,19 +292,9 @@ try
 	_tms_user = f.string_child ("TMSUser");
 	_tms_password = f.string_child ("TMSPassword");
 
-	optional<string> c;
-	c = f.optional_string_child ("SoundProcessor");
-	if (c) {
-		_cinema_sound_processor = CinemaSoundProcessor::from_id (c.get ());
-	}
-	c = f.optional_string_child ("CinemaSoundProcessor");
-	if (c) {
-		_cinema_sound_processor = CinemaSoundProcessor::from_id (c.get ());
-	}
-
 	_language = f.optional_string_child ("Language");
 
-	c = f.optional_string_child ("DefaultContainer");
+	optional<string> c = f.optional_string_child ("DefaultContainer");
 	if (c) {
 		_default_container = Ratio::from_id (c.get ());
 	}
@@ -396,6 +385,7 @@ try
 	_maximum_j2k_bandwidth = f.optional_number_child<int> ("MaximumJ2KBandwidth").get_value_or (250000000);
 	_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false);
 	_allow_any_container = f.optional_bool_child ("AllowAnyContainer").get_value_or (false);
+	_show_experimental_audio_processors = f.optional_bool_child ("ShowExperimentalAudioProcessors").get_value_or (false);
 
 	_log_types = f.optional_number_child<int> ("LogTypes").get_value_or (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR);
 	_analyse_ebur128 = f.optional_bool_child("AnalyseEBUR128").get_value_or (true);
@@ -698,12 +688,6 @@ Config::write_config () const
 	root->add_child("TMSUser")->add_child_text (_tms_user);
 	/* [XML] TMSPassword Password to log into the TMS with. */
 	root->add_child("TMSPassword")->add_child_text (_tms_password);
-	if (_cinema_sound_processor) {
-		/* [XML:opt] CinemaSoundProcessor Identifier of the type of cinema sound processor to use when calculating
-		   gain changes from fader positions.  Currently can only be <code>dolby_cp750</code>.
-		*/
-		root->add_child("CinemaSoundProcessor")->add_child_text (_cinema_sound_processor->id ());
-	}
 	if (_language) {
 		/* [XML:opt] Language Language to use in the GUI e.g. <code>fr_FR</code>. */
 		root->add_child("Language")->add_child_text (_language.get());
@@ -819,6 +803,8 @@ Config::write_config () const
 	root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0");
 	/* [XML] AllowAnyContainer 1 to allow users to user any container ratio for their DCP, 0 to limit the GUI to standard containers. */
 	root->add_child("AllowAnyContainer")->add_child_text (_allow_any_container ? "1" : "0");
+	/* [XML] ShowExperimentalAudioProcessors 1 to offer users the (experimental) audio upmixer processors, 0 to hide them */
+	root->add_child("ShowExperimentalAudioProcessors")->add_child_text (_show_experimental_audio_processors ? "1" : "0");
 	/* [XML] LogTypes Types of logging to write; a bitfield where 1 is general notes, 2 warnings, 4 errors, 8 debug information related
 	   to encoding, 16 debug information related to encoding, 32 debug information for timing purposes, 64 debug information related
 	   to sending email.
@@ -1248,8 +1234,12 @@ Config::clean_history_internal (vector<boost::filesystem::path>& h)
 	vector<boost::filesystem::path> old = h;
 	h.clear ();
 	BOOST_FOREACH (boost::filesystem::path i, old) {
-		if (boost::filesystem::is_directory(i)) {
-			h.push_back (i);
+		try {
+			if (boost::filesystem::is_directory(i)) {
+				h.push_back (i);
+			}
+		} catch (...) {
+			/* We couldn't find out if it's a directory for some reason; just ignore it */
 		}
 	}
 }