Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index c84ce76b514bf64cf6e370c8231871857832c534..13d36d236da762fe7f9d9e999165b3c43f952fdb 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,6 +27,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
+#include "dci_metadata.h"
 
 class ServerDescription;
 class Scaler;
@@ -94,6 +95,18 @@ public:
                return _sound_processor;
        }
 
+       std::list<int> allowed_dcp_frame_rates () const {
+               return _allowed_dcp_frame_rates;
+       }
+       
+       DCIMetadata default_dci_metadata () const {
+               return _default_dci_metadata;
+       }
+
+       boost::optional<std::string> language () const {
+               return _language;
+       }
+
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                _num_local_encoding_threads = n;
@@ -140,14 +153,32 @@ public:
        void set_tms_password (std::string p) {
                _tms_password = p;
        }
+
+       void set_allowed_dcp_frame_rates (std::list<int> const & r) {
+               _allowed_dcp_frame_rates = r;
+       }
+
+       void set_default_dci_metadata (DCIMetadata d) {
+               _default_dci_metadata = d;
+       }
+
+       void set_language (std::string l) {
+               _language = l;
+       }
+
+       void unset_language () {
+               _language = boost::none;
+       }
        
        void write () const;
 
        static Config* instance ();
+       static void drop ();
 
 private:
        Config ();
-       std::string file () const;
+       std::string file (bool) const;
+       void read_old_metadata ();
 
        /** number of threads to use for J2K encoding on the local machine */
        int _num_local_encoding_threads;
@@ -172,6 +203,10 @@ private:
        std::string _tms_password;
        /** Our sound processor */
        SoundProcessor const * _sound_processor;
+       std::list<int> _allowed_dcp_frame_rates;
+       /** Default DCI metadata for newly-created Films */
+       DCIMetadata _default_dci_metadata;
+       boost::optional<std::string> _language;
 
        /** Singleton instance, or 0 */
        static Config* _instance;