Different configuration of filename format for assets / metadata (since CPL/PKL files...

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

diff --git a/src/lib/config.h b/src/lib/config.h
index d89adf4916b083087261dac9f99f6f8a26dd8d36..a988cda6b7f11b687303ac255dd97b337aa1c7b0 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -26,8 +26,8 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "kdm_name_format.h"
 #include "types.h"
+#include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/shared_ptr.hpp>
@@ -267,10 +267,18 @@ public:
                return _show_hints_before_make_dcp;
        }
 
-       KDMNameFormat kdm_filename_format () const {
+       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);
@@ -467,8 +475,7 @@ public:
        }
 #endif
 
-       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms)
-       {
+       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms) {
                _dkdms = dkdms;
                changed ();
        }
@@ -479,10 +486,18 @@ public:
                maybe_set (_show_hints_before_make_dcp, s);
        }
 
-       void set_kdm_filename_format (KDMNameFormat n) {
+       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 ();
@@ -594,7 +609,9 @@ private:
        std::vector<dcp::EncryptedKDM> _dkdms;
        boost::filesystem::path _cinemas_file;
        bool _show_hints_before_make_dcp;
-       KDMNameFormat _kdm_filename_format;
+       dcp::NameFormat _kdm_filename_format;
+       dcp::NameFormat _dcp_metadata_filename_format;
+       dcp::NameFormat _dcp_asset_filename_format;
 
        /** Singleton instance, or 0 */
        static Config* _instance;