Merge remote-tracking branch 'origin/master' into 2.0

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

diff --git a/src/lib/config.h b/src/lib/config.h
index c359901a48f2df2543311c83e1aa2bf4f0a17591..66ff662142133b6e4258b49c745b93759430252f 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,15 +28,14 @@
 #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;
 class Filter;
-class SoundProcessor;
+class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
 class Cinema;
@@ -104,9 +103,9 @@ public:
                return _tms_password;
        }
 
-       /** @return The sound processor that we are using */
-       SoundProcessor const * sound_processor () const {
-               return _sound_processor;
+       /** @return The cinema sound processor that we are using */
+       CinemaSoundProcessor const * cinema_sound_processor () const {
+               return _cinema_sound_processor;
        }
 
        std::list<boost::shared_ptr<Cinema> > cinemas () const {
@@ -141,7 +140,7 @@ public:
                return _default_dcp_content_type;
        }
 
-       libdcp::XMLMetadata dcp_metadata () const {
+       dcp::XMLMetadata dcp_metadata () const {
                return _dcp_metadata;
        }
 
@@ -169,10 +168,18 @@ public:
                return _mail_password;
        }
 
+       std::string kdm_subject () const {
+               return _kdm_subject;
+       }
+
        std::string kdm_from () const {
                return _kdm_from;
        }
 
+       std::string kdm_cc () const {
+               return _kdm_cc;
+       }
+       
        std::string kdm_email () const {
                return _kdm_email;
        }
@@ -284,7 +291,7 @@ public:
                changed ();
        }
 
-       void set_dcp_metadata (libdcp::XMLMetadata m) {
+       void set_dcp_metadata (dcp::XMLMetadata m) {
                _dcp_metadata = m;
                changed ();
        }
@@ -319,11 +326,21 @@ public:
                changed ();
        }
 
+       void set_kdm_subject (std::string s) {
+               _kdm_subject = s;
+               changed ();
+       }
+
        void set_kdm_from (std::string f) {
                _kdm_from = f;
                changed ();
        }
 
+       void set_kdm_cc (std::string f) {
+               _kdm_cc = f;
+               changed ();
+       }
+       
        void set_kdm_email (std::string e) {
                _kdm_email = e;
                changed ();
@@ -363,7 +380,6 @@ private:
        Config ();
        boost::filesystem::path file (bool) const;
        void read ();
-       void read_old_metadata ();
        void write () const;
 
        /** number of threads to use for J2K encoding on the local machine */
@@ -386,8 +402,8 @@ private:
        std::string _tms_user;
        /** Password to log into the TMS with */
        std::string _tms_password;
-       /** Our sound processor */
-       SoundProcessor const * _sound_processor;
+       /** Our cinema sound processor */
+       CinemaSoundProcessor const * _cinema_sound_processor;
        std::list<int> _allowed_dcp_frame_rates;
        /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
        bool _allow_any_dcp_frame_rate;
@@ -397,7 +413,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;
@@ -405,7 +421,9 @@ private:
        std::string _mail_server;
        std::string _mail_user;
        std::string _mail_password;
+       std::string _kdm_subject;
        std::string _kdm_from;
+       std::string _kdm_cc;
        std::string _kdm_email;
        /** true to check for updates on startup */
        bool _check_for_updates;