Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 1ffcfdb9881831f90de4e98d5f3c7c4196c87eba..a38fb129cdc5f3bca38e3c83af7fefb18ab85c8a 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>
@@ -38,6 +39,7 @@ class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
 class Cinema;
+class Film;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -262,6 +264,26 @@ public:
                return _cinemas_file;
        }
 
+       bool show_hints_before_make_dcp () const {
+               return _show_hints_before_make_dcp;
+       }
+
+       bool confirm_kdm_email () const {
+               return _confirm_kdm_email;
+       }
+
+       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);
@@ -458,14 +480,33 @@ public:
        }
 #endif
 
-       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms)
-       {
+       void set_dkdms (std::vector<dcp::EncryptedKDM> dkdms) {
                _dkdms = dkdms;
                changed ();
        }
 
        void set_cinemas_file (boost::filesystem::path file);
 
+       void set_show_hints_before_make_dcp (bool s) {
+               maybe_set (_show_hints_before_make_dcp, s);
+       }
+
+       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_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 ();
@@ -475,9 +516,20 @@ public:
 
        void changed (Property p = OTHER);
        boost::signals2::signal<void (Property)> Changed;
+       /** Emitted if ::read() failed on an existing Config file.  There is nothing
+           a listener can do about it: this is just for information.
+       */
+       static boost::signals2::signal<void ()> FailedToLoad;
 
        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 ();
@@ -572,6 +624,11 @@ private:
        std::vector<boost::filesystem::path> _history;
        std::vector<dcp::EncryptedKDM> _dkdms;
        boost::filesystem::path _cinemas_file;
+       bool _show_hints_before_make_dcp;
+       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;