Merge master.

1 files changed, 14 insertions, 2 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 3cfaa1200..05bc7945f 100644
--- 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;
 };