Tweaks for libdcp.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 14c707dd2dcf85d70fe4449b05d82637040cf7fb..14cd640eeeefb2a042086dd600b447626103f044 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,7 +28,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
+#include <dcp/metadata.h>
 #include "dci_metadata.h"
 #include "colour_conversion.h"
 #include "server.h"
@@ -135,7 +135,7 @@ public:
                return _default_dcp_content_type;
        }
 
-       libdcp::XMLMetadata dcp_metadata () const {
+       dcp::XMLMetadata dcp_metadata () const {
                return _dcp_metadata;
        }
 
@@ -155,6 +155,14 @@ public:
                return _mail_server;
        }
 
+       std::string mail_user () const {
+               return _mail_user;
+       }
+
+       std::string mail_password () const {
+               return _mail_password;
+       }
+
        std::string kdm_from () const {
                return _kdm_from;
        }
@@ -163,6 +171,14 @@ public:
                return _kdm_email;
        }
 
+       bool check_for_updates () const {
+               return _check_for_updates;
+       }
+
+       bool check_for_test_updates () const {
+               return _check_for_test_updates;
+       }
+       
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                _num_local_encoding_threads = n;
@@ -177,14 +193,6 @@ public:
                _server_port_base = p;
        }
 
-       void set_reference_scaler (Scaler const * s) {
-               _reference_scaler = s;
-       }
-       
-       void set_reference_filters (std::vector<Filter const *> const & f) {
-               _reference_filters = f;
-       }
-
        /** @param i IP address of a TMS that we can copy DCPs to */
        void set_tms_ip (std::string i) {
                _tms_ip = i;
@@ -241,7 +249,7 @@ public:
                _default_dcp_content_type = t;
        }
 
-       void set_dcp_metadata (libdcp::XMLMetadata m) {
+       void set_dcp_metadata (dcp::XMLMetadata m) {
                _dcp_metadata = m;
        }
 
@@ -261,6 +269,14 @@ public:
                _mail_server = s;
        }
 
+       void set_mail_user (std::string u) {
+               _mail_user = u;
+       }
+
+       void set_mail_password (std::string p) {
+               _mail_password = p;
+       }
+
        void set_kdm_from (std::string f) {
                _kdm_from = f;
        }
@@ -268,6 +284,14 @@ public:
        void set_kdm_email (std::string e) {
                _kdm_email = e;
        }
+
+       void set_check_for_updates (bool c) {
+               _check_for_updates = c;
+       }
+
+       void set_check_for_test_updates (bool c) {
+               _check_for_test_updates = c;
+       }
        
        void write () const;
 
@@ -294,10 +318,6 @@ private:
        bool _use_any_servers;
        /** J2K encoding servers that should definitely be used */
        std::vector<std::string> _servers;
-       /** Scaler to use for the "A" part of A/B comparisons */
-       Scaler const * _reference_scaler;
-       /** Filters to use for the "A" part of A/B comparisons */
-       std::vector<Filter const *> _reference_filters;
        /** The IP address of a TMS that we can copy DCPs to */
        std::string _tms_ip;
        /** The path on a TMS that we should write DCPs to */
@@ -315,14 +335,19 @@ private:
        int _default_still_length;
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
-       libdcp::XMLMetadata _dcp_metadata;
+       dcp::XMLMetadata _dcp_metadata;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        std::vector<PresetColourConversion> _colour_conversions;
        std::list<boost::shared_ptr<Cinema> > _cinemas;
        std::string _mail_server;
+       std::string _mail_user;
+       std::string _mail_password;
        std::string _kdm_from;
        std::string _kdm_email;
+       /** true to check for updates on startup */
+       bool _check_for_updates;
+       bool _check_for_test_updates;
 
        /** Singleton instance, or 0 */
        static Config* _instance;