From 3c4eb194c031950165ab63785368784a38bd752d Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 13 Jul 2014 22:01:31 +0100
Subject: [PATCH] Remove support for (very) old config file format.

---
 src/lib/config.cc | 65 -----------------------------------------------
 src/lib/config.h  |  1 -
 2 files changed, 66 deletions(-)

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 209b924fa..d4976676d 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -90,7 +90,6 @@ void
 Config::read ()
 {
 	if (!boost::filesystem::exists (file (false))) {
-		read_old_metadata ();
 		return;
 	}
 
@@ -203,70 +202,6 @@ Config::read ()
 	_log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR);
 }
 
-void
-Config::read_old_metadata ()
-{
-	/* XXX: this won't work with non-Latin filenames */
-	ifstream f (file(true).string().c_str ());
-	string line;
-
-	while (getline (f, line)) {
-		if (line.empty ()) {
-			continue;
-		}
-
-		if (line[0] == '#') {
-			continue;
-		}
-
-		size_t const s = line.find (' ');
-		if (s == string::npos) {
-			continue;
-		}
-		
-		string const k = line.substr (0, s);
-		string const v = line.substr (s + 1);
-
-		if (k == N_("num_local_encoding_threads")) {
-			_num_local_encoding_threads = atoi (v.c_str ());
-		} else if (k == N_("default_directory")) {
-			_default_directory = v;
-		} else if (k == N_("server_port")) {
-			_server_port_base = atoi (v.c_str ());
-		} else if (k == N_("server")) {
-			vector<string> b;
-			split (b, v, is_any_of (" "));
-			if (b.size() == 2) {
-				_servers.push_back (b[0]);
-			}
-		} else if (k == N_("tms_ip")) {
-			_tms_ip = v;
-		} else if (k == N_("tms_path")) {
-			_tms_path = v;
-		} else if (k == N_("tms_user")) {
-			_tms_user = v;
-		} else if (k == N_("tms_password")) {
-			_tms_password = v;
-		} else if (k == N_("sound_processor")) {
-			_cinema_sound_processor = CinemaSoundProcessor::from_id (v);
-		} else if (k == "language") {
-			_language = v;
-		} else if (k == "default_container") {
-			_default_container = Ratio::from_id (v);
-		} else if (k == "default_dcp_content_type") {
-			_default_dcp_content_type = DCPContentType::from_isdcf_name (v);
-		} else if (k == "dcp_metadata_issuer") {
-			_dcp_metadata.issuer = v;
-		} else if (k == "dcp_metadata_creator") {
-			_dcp_metadata.creator = v;
-		} else if (k == "dcp_metadata_issue_date") {
-			_dcp_metadata.issue_date = v;
-		}
-
-		_default_isdcf_metadata.read_old_metadata (k, v);
-	}
-}
-
 /** @return Filename to write configuration to */
 boost::filesystem::path
 Config::file (bool old) const
diff --git a/src/lib/config.h b/src/lib/config.h
index 2bc07b683..f26e2532a 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -371,7 +371,6 @@ private:
 	Config ();
 	boost::filesystem::path file (bool) const;
 	void read ();
-	void read_old_metadata ();
 	void write () const;
 
 	/** number of threads to use for J2K encoding on the local machine */
-- 
2.30.2