X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=9a57b1b484624b36a73055911944e1ae374a78d1;hb=95ddf2cc72b800967b9917f75917cfdde325d2e5;hp=a982c9727623783a48b0f7cfc5659480c630613e;hpb=e075012124424b77044b5d61885ed2646d3781cd;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index a982c9727..9a57b1b48 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,6 +27,7 @@
 
 #include "isdcf_metadata.h"
 #include "types.h"
+#include "state.h"
 #include "edid.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
@@ -46,7 +47,7 @@ class DKDMGroup;
 /** @class Config
  *  @brief A singleton class holding configuration.
  */
-class Config : public boost::noncopyable
+class Config : public State
 {
 public:
 	/** @return number of threads which a master DoM should use for J2K encoding on the local machine */
@@ -140,11 +141,6 @@ public:
 		return _tms_password;
 	}
 
-	/** @return The cinema sound processor that we are using */
-	CinemaSoundProcessor const * cinema_sound_processor () const {
-		return _cinema_sound_processor;
-	}
-
 	std::list<boost::shared_ptr<Cinema> > cinemas () const {
 		return _cinemas;
 	}
@@ -375,6 +371,8 @@ public:
 		/* Not really a nag but it's the same idea */
 		NAG_INITIAL_SETUP,
 		NAG_IMPORT_DECRYPTION_CHAIN,
+		NAG_DELETE_DKDM,
+		NAG_32_ON_64,
 		NAG_COUNT
 	};
 
@@ -486,6 +484,15 @@ public:
 		return _image_display;
 	}
 
+	enum VideoViewType {
+		VIDEO_VIEW_SIMPLE,
+		VIDEO_VIEW_OPENGL
+	};
+
+	VideoViewType video_view_type () const {
+		return _video_view_type;
+	}
+
 	bool respect_kdm_validity_periods () const {
 		return _respect_kdm_validity_periods;
 	}
@@ -952,6 +959,10 @@ public:
 		maybe_set (_image_display, n);
 	}
 
+	void set_video_view_type (VideoViewType v) {
+		maybe_set (_video_view_type, v);
+	}
+
 	void set_respect_kdm_validity_periods (bool r) {
 		maybe_set (_respect_kdm_validity_periods, r);
 	}
@@ -1070,10 +1081,16 @@ public:
 	static boost::signals2::signal<void ()> FailedToLoad;
 	/** Emitted if read() issued a warning which the user might want to know about */
 	static boost::signals2::signal<void (std::string)> Warning;
-	/** Emitted if there is a bad certificate in the signer chain.  Handler can call
-	 *  true to ask Config to re-create the chain.
+	/** Emitted if there is a something wrong the contents of our config.  Handler can call
+	 *  true to ask Config to solve the problem (by discarding and recreating the bad thing)
 	 */
-	static boost::signals2::signal<bool (void)> BadSignerChain;
+	enum BadReason {
+		BAD_SIGNER_UTF8_STRINGS,     ///< signer chain contains UTF-8 strings (not PRINTABLESTRING)
+		BAD_SIGNER_INCONSISTENT,     ///< signer chain is somehow inconsistent
+		BAD_DECRYPTION_INCONSISTENT, ///< KDM decryption chain is somehow inconsistent
+	};
+
+	static boost::signals2::signal<bool (BadReason)> Bad;
 
 	void write () const;
 	void write_config () const;
@@ -1094,10 +1111,6 @@ public:
 	static void restore_defaults ();
 	static bool have_existing (std::string);
 	static boost::filesystem::path config_file ();
-	static boost::filesystem::path path (std::string file, bool create_directories = true);
-
-	/** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml and cinemas.xml */
-	static boost::optional<boost::filesystem::path> override_path;
 
 private:
 	Config ();
@@ -1155,8 +1168,6 @@ private:
 	std::string _tms_user;
 	/** Password to log into the TMS with */
 	std::string _tms_password;
-	/** Our cinema sound processor */
-	CinemaSoundProcessor const * _cinema_sound_processor;
 	/** The list of possible DCP frame rates that DCP-o-matic will use */
 	std::list<int> _allowed_dcp_frame_rates;
 	/** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
@@ -1256,6 +1267,7 @@ private:
 	Interface _interface_complexity;
 	PlayerMode _player_mode;
 	int _image_display;
+	VideoViewType _video_view_type;
 	bool _respect_kdm_validity_periods;
 	/** Log file containing things the player does (e.g. started, stopped, loaded
 	    playlist etc.)  Does not contain debugging information.