Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 3cfaa12007677a1c4f6939a9751ba4a127dee824..05bc7945f1df80bb77c6f846d01c0a161ac80810 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -221,7 +221,11 @@ public:
        int log_types () const {
                return _log_types;
        }
-       
+
+       std::vector<boost::filesystem::path> history () const {
+               return _history;
+       }
+
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                _num_local_encoding_threads = n;
@@ -414,6 +418,13 @@ public:
                _log_types = t;
                changed ();
        }
+
+       void clear_history () {
+               _history.clear ();
+               changed ();
+       }
+
+       void add_to_history (boost::filesystem::path p);
        
        void changed ();
        boost::signals2::signal<void ()> Changed;
@@ -482,7 +493,8 @@ private:
        /** maximum allowed J2K bandwidth in bits per second */
        int _maximum_j2k_bandwidth;
        int _log_types;
-
+       std::vector<boost::filesystem::path> _history;
+       
        /** Singleton instance, or 0 */
        static Config* _instance;
 };