Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 3cc7c49c463950f8300fac0085266ae9b6df8fad..45a9e282b7aed6ea638c540d264defd3df26b21a 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -24,16 +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 <dcp/metadata.h>
-#include <dcp/certificates.h>
-#include <dcp/signer.h>
 #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 <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
 
 class ServerDescription;
 class Scaler;
@@ -135,10 +135,6 @@ public:
                return _default_still_length;
        }
 
-       VideoContentScale default_scale () const {
-               return _default_scale;
-       }
-
        Ratio const * default_container () const {
                return _default_container;
        }
@@ -223,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;
        }
@@ -308,11 +310,6 @@ public:
                changed ();
        }
 
-       void set_default_scale (VideoContentScale s) {
-               _default_scale = s;
-               changed ();
-       }
-
        void set_default_container (Ratio const * c) {
                _default_container = c;
                changed ();
@@ -420,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 ();
@@ -469,7 +473,6 @@ private:
        ISDCFMetadata _default_isdcf_metadata;
        boost::optional<std::string> _language;
        int _default_still_length;
-       VideoContentScale _default_scale;
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        std::string _dcp_issuer;
@@ -494,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 */