Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 0e9c4a60aed4ade7c699b949823625ddedf7bdfa..13d36d236da762fe7f9d9e999165b3c43f952fdb 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -165,14 +165,20 @@ public:
        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;