Build fix.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 37a55a6954f7f9f7db41fc1b8ebceef19fb5cdc2..a38fb129cdc5f3bca38e3c83af7fefb18ab85c8a 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -26,9 +26,8 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "kdm_name_format.h"
 #include "types.h"
-#include <dcp/filename_format.h>
+#include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/shared_ptr.hpp>
@@ -40,6 +39,7 @@ class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
 class Cinema;
+class Film;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -268,12 +268,20 @@ public:
                return _show_hints_before_make_dcp;
        }
 
-       KDMNameFormat kdm_filename_format () const {
+       bool confirm_kdm_email () const {
+               return _confirm_kdm_email;
+       }
+
+       dcp::NameFormat kdm_filename_format () const {
                return _kdm_filename_format;
        }
 
-       dcp::FilenameFormat dcp_filename_format () const {
-               return _dcp_filename_format;
+       dcp::NameFormat dcp_metadata_filename_format () const {
+               return _dcp_metadata_filename_format;
+       }
+
+       dcp::NameFormat dcp_asset_filename_format () const {
+               return _dcp_asset_filename_format;
        }
 
        /** @param n New number of local encoding threads */
@@ -472,8 +480,7 @@ public:
        }
 #endif
 
-       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms)
-       {
+       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms) {
                _dkdms = dkdms;
                changed ();
        }
@@ -484,12 +491,20 @@ public:
                maybe_set (_show_hints_before_make_dcp, s);
        }
 
-       void set_kdm_filename_format (KDMNameFormat n) {
+       void set_confirm_kdm_email (bool s) {
+               maybe_set (_confirm_kdm_email, s);
+       }
+
+       void set_kdm_filename_format (dcp::NameFormat n) {
                maybe_set (_kdm_filename_format, n);
        }
 
-       void set_dcp_filename_format (dcp::FilenameFormat n) {
-               maybe_set (_dcp_filename_format, n);
+       void set_dcp_metadata_filename_format (dcp::NameFormat n) {
+               maybe_set (_dcp_metadata_filename_format, n);
+       }
+
+       void set_dcp_asset_filename_format (dcp::NameFormat n) {
+               maybe_set (_dcp_asset_filename_format, n);
        }
 
        void clear_history () {
@@ -508,6 +523,13 @@ public:
 
        void write () const;
 
+       void save_template (boost::shared_ptr<const Film> film, std::string name) const;
+       bool existing_template (std::string name) const;
+       std::list<std::string> templates () const;
+       boost::filesystem::path template_path (std::string name) const;
+       void rename_template (std::string old_name, std::string new_name) const;
+       void delete_template (std::string name) const;
+
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
@@ -603,8 +625,10 @@ private:
        std::vector<dcp::EncryptedKDM> _dkdms;
        boost::filesystem::path _cinemas_file;
        bool _show_hints_before_make_dcp;
-       KDMNameFormat _kdm_filename_format;
-       dcp::FilenameFormat _dcp_filename_format;
+       bool _confirm_kdm_email;
+       dcp::NameFormat _kdm_filename_format;
+       dcp::NameFormat _dcp_metadata_filename_format;
+       dcp::NameFormat _dcp_asset_filename_format;
 
        /** Singleton instance, or 0 */
        static Config* _instance;