Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 671f53ef32dbcaf955f8109e6d46de6444ab8158..d9f104c7dec1a9c33cb29b0310ffc6c386367be4 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,10 +28,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
+#include <dcp/metadata.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
-#include "server.h"
 
 class ServerDescription;
 class Scaler;
@@ -141,7 +140,7 @@ public:
                return _default_dcp_content_type;
        }
 
-       libdcp::XMLMetadata dcp_metadata () const {
+       dcp::XMLMetadata dcp_metadata () const {
                return _dcp_metadata;
        }
 
@@ -173,6 +172,10 @@ public:
                return _kdm_from;
        }
 
+       std::string kdm_cc () const {
+               return _kdm_cc;
+       }
+       
        std::string kdm_email () const {
                return _kdm_email;
        }
@@ -284,7 +287,7 @@ public:
                changed ();
        }
 
-       void set_dcp_metadata (libdcp::XMLMetadata m) {
+       void set_dcp_metadata (dcp::XMLMetadata m) {
                _dcp_metadata = m;
                changed ();
        }
@@ -324,11 +327,18 @@ public:
                changed ();
        }
 
+       void set_kdm_cc (std::string f) {
+               _kdm_cc = f;
+               changed ();
+       }
+       
        void set_kdm_email (std::string e) {
                _kdm_email = e;
                changed ();
        }
 
+       void reset_kdm_email ();
+
        void set_check_for_updates (bool c) {
                _check_for_updates = c;
                changed ();
@@ -395,7 +405,7 @@ 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;
@@ -404,6 +414,7 @@ private:
        std::string _mail_user;
        std::string _mail_password;
        std::string _kdm_from;
+       std::string _kdm_cc;
        std::string _kdm_email;
        /** true to check for updates on startup */
        bool _check_for_updates;