Bump libdcp for new method.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 61c6bfa69f8fa1eb3d980244d8c63cdab25c3c56..3df5c3795e7d4666835a5a5bf3efcf4c98107bee 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,6 +27,7 @@
 
 #include "isdcf_metadata.h"
 #include "types.h"
+#include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/shared_ptr.hpp>
@@ -266,6 +267,18 @@ public:
                return _show_hints_before_make_dcp;
        }
 
+       dcp::NameFormat kdm_filename_format () const {
+               return _kdm_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 */
        void set_num_local_encoding_threads (int n) {
                maybe_set (_num_local_encoding_threads, n);
@@ -462,8 +475,7 @@ public:
        }
 #endif
 
-       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms)
-       {
+       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms) {
                _dkdms = dkdms;
                changed ();
        }
@@ -474,6 +486,18 @@ public:
                maybe_set (_show_hints_before_make_dcp, s);
        }
 
+       void set_kdm_filename_format (dcp::NameFormat n) {
+               maybe_set (_kdm_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 () {
                _history.clear ();
                changed ();
@@ -490,6 +514,8 @@ public:
 
        void write () const;
 
+       void save_template (boost::shared_ptr<const Film> film, std::string name) const;
+
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
@@ -585,6 +611,9 @@ private:
        std::vector<dcp::EncryptedKDM> _dkdms;
        boost::filesystem::path _cinemas_file;
        bool _show_hints_before_make_dcp;
+       dcp::NameFormat _kdm_filename_format;
+       dcp::NameFormat _dcp_metadata_filename_format;
+       dcp::NameFormat _dcp_asset_filename_format;
 
        /** Singleton instance, or 0 */
        static Config* _instance;