Merge master.

[dcpomatic.git] / src / lib / config.h

diff --git a/src/lib/config.h b/src/lib/config.h
index 05bc7945f1df80bb77c6f846d01c0a161ac80810..55a172d78df40ed7c62025ff60c5422c7e9406fc 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -33,6 +33,7 @@
 #include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
+#include "video_content.h"
 
 class ServerDescription;
 class Scaler;
@@ -134,7 +135,7 @@ public:
                return _default_still_length;
        }
 
-       Ratio const * default_scale () const {
+       VideoContentScale default_scale () const {
                return _default_scale;
        }
 
@@ -146,8 +147,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 +223,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,7 +314,7 @@ public:
                changed ();
        }
 
-       void set_default_scale (Ratio const * s) {
+       void set_default_scale (VideoContentScale s) {
                _default_scale = s;
                changed ();
        }
@@ -322,8 +329,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 +426,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 +448,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 +482,10 @@ private:
        ISDCFMetadata _default_isdcf_metadata;
        boost::optional<std::string> _language;
        int _default_still_length;
-       Ratio const * _default_scale;
+       VideoContentScale _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 +507,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 */