Provide option of default DCI name details (#42).

3 files changed, 17 insertions, 1 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 65d01bf00..c4659eecf 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -86,6 +86,8 @@ Config::Config ()
 		} else if (k == "sound_processor") {
 			_sound_processor = SoundProcessor::from_id (v);
 		}
+
+		_default_dci_metadata.read (k, v);
 	}
 }
 
@@ -132,7 +134,9 @@ Config::write () const
 	f << "tms_path " << _tms_path << "\n";
 	f << "tms_user " << _tms_user << "\n";
 	f << "tms_password " << _tms_password << "\n";
-	f << "sound_processor " << _sound_processor->id ();
+	f << "sound_processor " << _sound_processor->id () << "\n";
+
+	_default_dci_metadata.write (f);
 }
 
 string
diff --git a/src/lib/config.h b/src/lib/config.h
index c84ce76b5..98cbf67e5 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,6 +27,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
+#include "dci_metadata.h"
 
 class ServerDescription;
 class Scaler;
@@ -94,6 +95,10 @@ public:
 		return _sound_processor;
 	}
 
+	DCIMetadata default_dci_metadata () const {
+		return _default_dci_metadata;
+	}
+
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
 		_num_local_encoding_threads = n;
@@ -140,6 +145,10 @@ public:
 	void set_tms_password (std::string p) {
 		_tms_password = p;
 	}
+
+	void set_default_dci_metadata (DCIMetadata d) {
+		_default_dci_metadata = d;
+	}
 	
 	void write () const;
 
@@ -172,6 +181,8 @@ private:
 	std::string _tms_password;
 	/** Our sound processor */
 	SoundProcessor const * _sound_processor;
+	/** Default DCI metadata for newly-created Films */
+	DCIMetadata _default_dci_metadata;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index df89a2552..f5522b74a 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -101,6 +101,7 @@ Film::Film (string d, bool must_exist)
 	, _subtitle_scale (1)
 	, _colour_lut (0)
 	, _j2k_bandwidth (200000000)
+	, _dci_metadata (Config::instance()->default_dci_metadata ())
 	, _frames_per_second (0)
 	, _dirty (false)
 {