X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=c43a4f079ef4b9753ebb02ea50ec2a2633f4758e;hb=596441a4e8cf03a88113646ca6da2f90e721a38b;hp=c41437efbe290f6aacad37ec5387fd21dc4d99db;hpb=420adb1fd2910fd24eb84be98169afc209f76a0e;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index c41437efb..c43a4f079 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -21,17 +21,21 @@
  *  @brief Class holding configuration.
  */
 
-#ifndef DVDOMATIC_CONFIG_H
-#define DVDOMATIC_CONFIG_H
+#ifndef DCPOMATIC_CONFIG_H
+#define DCPOMATIC_CONFIG_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
+#include <libdcp/metadata.h>
+#include "dci_metadata.h"
 
 class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
+class Container;
+class DCPContentType;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -98,6 +102,30 @@ public:
 		return _allowed_dcp_frame_rates;
 	}
 	
+	DCIMetadata default_dci_metadata () const {
+		return _default_dci_metadata;
+	}
+
+	boost::optional<std::string> language () const {
+		return _language;
+	}
+
+	int default_still_length () const {
+		return _default_still_length;
+	}
+
+	Container const * default_container () const {
+		return _default_container;
+	}
+
+	DCPContentType const * default_dcp_content_type () const {
+		return _default_dcp_content_type;
+	}
+
+	libdcp::XMLMetadata dcp_metadata () const {
+		return _dcp_metadata;
+	}
+
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
 		_num_local_encoding_threads = n;
@@ -149,13 +177,44 @@ public:
 		_allowed_dcp_frame_rates = r;
 	}
 
+	void set_default_dci_metadata (DCIMetadata d) {
+		_default_dci_metadata = d;
+	}
+
+	void set_language (std::string l) {
+		_language = l;
+	}
+
+	void unset_language () {
+		_language = boost::none;
+	}
+
+	void set_default_still_length (int s) {
+		_default_still_length = s;
+	}
+
+	void set_default_container (Container const * f) {
+		_default_container = f;
+	}
+
+	void set_default_dcp_content_type (DCPContentType const * t) {
+		_default_dcp_content_type = t;
+	}
+
+	void set_dcp_metadata (libdcp::XMLMetadata m) {
+		_dcp_metadata = m;
+	}
+	
 	void write () const;
 
 	static Config* instance ();
+	static void drop ();
 
 private:
 	Config ();
-	std::string file () const;
+	std::string file (bool) const;
+	void read ();
+	void read_old_metadata ();
 
 	/** number of threads to use for J2K encoding on the local machine */
 	int _num_local_encoding_threads;
@@ -181,6 +240,13 @@ private:
 	/** Our sound processor */
 	SoundProcessor const * _sound_processor;
 	std::list<int> _allowed_dcp_frame_rates;
+	/** Default DCI metadata for newly-created Films */
+	DCIMetadata _default_dci_metadata;
+	boost::optional<std::string> _language;
+	int _default_still_length;
+	Container const * _default_container;
+	DCPContentType const * _default_dcp_content_type;
+	libdcp::XMLMetadata _dcp_metadata;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;