Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 05005e5903d374a97472821976001320351c8133..110bcc6a8de5dabbd3aa9a19110f60cb0b200403 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -34,8 +34,8 @@ class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
-class Format;
 class DCPContentType;
+class Ratio;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -114,8 +114,8 @@ public:
                return _default_still_length;
        }
 
-       Format const * default_format () const {
-               return _default_format;
+       Ratio const * default_container () const {
+               return _default_container;
        }
 
        DCPContentType const * default_dcp_content_type () const {
@@ -193,8 +193,8 @@ public:
                _default_still_length = s;
        }
 
-       void set_default_format (Format const * f) {
-               _default_format = f;
+       void set_default_container (Ratio const * c) {
+               _default_container = c;
        }
 
        void set_default_dcp_content_type (DCPContentType const * t) {
@@ -213,6 +213,7 @@ public:
 private:
        Config ();
        std::string file (bool) const;
+       void read ();
        void read_old_metadata ();
 
        /** number of threads to use for J2K encoding on the local machine */
@@ -243,7 +244,7 @@ private:
        DCIMetadata _default_dci_metadata;
        boost::optional<std::string> _language;
        int _default_still_length;
-       Format const * _default_format;
+       Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        libdcp::XMLMetadata _dcp_metadata;