Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index fed297ad00f91018029f3b51b214bbf3b46c3bfd..13d36d236da762fe7f9d9e999165b3c43f952fdb 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -103,6 +103,10 @@ public:
                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;
@@ -157,14 +161,24 @@ public:
        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;
@@ -192,6 +206,7 @@ private:
        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;