X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=45a9e282b7aed6ea638c540d264defd3df26b21a;hb=5c93e50af883f02eadcf9a7bfe9cbfabbb3be844;hp=05bc7945f1df80bb77c6f846d01c0a161ac80810;hpb=2d24bc7aaed800415bce4fffe06f261d5e9e464a;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 05bc7945f..45a9e282b 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -24,15 +24,16 @@
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include <boost/filesystem.hpp>
+#include "isdcf_metadata.h"
+#include "colour_conversion.h"
+#include "video_content.h"
 #include <dcp/metadata.h>
 #include <dcp/certificates.h>
 #include <dcp/signer.h>
-#include "isdcf_metadata.h"
-#include "colour_conversion.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
 
 class ServerDescription;
 class Scaler;
@@ -134,10 +135,6 @@ public:
 		return _default_still_length;
 	}
 
-	Ratio const * default_scale () const {
-		return _default_scale;
-	}
-
 	Ratio const * default_container () const {
 		return _default_container;
 	}
@@ -146,8 +143,8 @@ public:
 		return _default_dcp_content_type;
 	}
 
-	dcp::XMLMetadata dcp_metadata () const {
-		return _dcp_metadata;
+	std::string dcp_issuer () const {
+		return _dcp_issuer;
 	}
 
 	int default_j2k_bandwidth () const {
@@ -222,6 +219,12 @@ public:
 		return _log_types;
 	}
 
+#ifdef DCPOMATIC_WINDOWS	
+	bool win32_console () const {
+		return _win32_console;
+	}
+#endif	
+
 	std::vector<boost::filesystem::path> history () const {
 		return _history;
 	}
@@ -307,11 +310,6 @@ public:
 		changed ();
 	}
 
-	void set_default_scale (Ratio const * s) {
-		_default_scale = s;
-		changed ();
-	}
-
 	void set_default_container (Ratio const * c) {
 		_default_container = c;
 		changed ();
@@ -322,8 +320,8 @@ public:
 		changed ();
 	}
 
-	void set_dcp_metadata (dcp::XMLMetadata m) {
-		_dcp_metadata = m;
+	void set_dcp_issuer (std::string i) {
+		_dcp_issuer = i;
 		changed ();
 	}
 
@@ -419,6 +417,13 @@ public:
 		changed ();
 	}
 
+#ifdef DCPOMATIC_WINDOWS	
+	void set_win32_console (bool c) {
+		_win32_console = c;
+		changed ();
+	}
+#endif	
+
 	void clear_history () {
 		_history.clear ();
 		changed ();
@@ -434,7 +439,7 @@ public:
 
 private:
 	Config ();
-	boost::filesystem::path file (bool) const;
+	boost::filesystem::path file () const;
 	void read ();
 	void write () const;
 	void make_decryption_keys ();
@@ -468,10 +473,9 @@ private:
 	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	Ratio const * _default_scale;
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
-	dcp::XMLMetadata _dcp_metadata;
+	std::string _dcp_issuer;
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	std::vector<PresetColourConversion> _colour_conversions;
@@ -493,6 +497,9 @@ private:
 	/** maximum allowed J2K bandwidth in bits per second */
 	int _maximum_j2k_bandwidth;
 	int _log_types;
+#ifdef DCPOMATIC_WINDOWS	
+	bool _win32_console;
+#endif	
 	std::vector<boost::filesystem::path> _history;
 	
 	/** Singleton instance, or 0 */