Allow multiple configuration files in DCP-o-matic's directory.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 6b1f3fb874e16cb13d858e4fa3302ed8bb256733..806853083e7e47b6d90752b5b8bdbbebd5dd4e71 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -195,7 +195,7 @@ public:
                return _kdm_from;
        }
 
-       std::string kdm_cc () const {
+       std::vector<std::string> kdm_cc () const {
                return _kdm_cc;
        }
 
@@ -386,7 +386,7 @@ public:
                maybe_set (_kdm_from, f);
        }
 
-       void set_kdm_cc (std::string f) {
+       void set_kdm_cc (std::vector<std::string> f) {
                maybe_set (_kdm_cc, f);
        }
 
@@ -458,11 +458,11 @@ public:
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
-       static bool have_existing ();
+       static bool have_existing (std::string);
 
 private:
        Config ();
-       static boost::filesystem::path file (bool create_directories = true);
+       static boost::filesystem::path path (std::string file, bool create_directories = true);
        void read ();
        void set_defaults ();
        void set_kdm_email_to_default ();
@@ -523,7 +523,7 @@ private:
        std::string _mail_password;
        std::string _kdm_subject;
        std::string _kdm_from;
-       std::string _kdm_cc;
+       std::vector<std::string> _kdm_cc;
        std::string _kdm_bcc;
        std::string _kdm_email;
        boost::shared_ptr<const dcp::CertificateChain> _signer_chain;