X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frecent_sessions.cc;h=7c2297448b505d29f06161b13d7b1b17278402f6;hb=b9054a1f723f6107f42a04ae9838820bbbd1f0ce;hp=a5c6b210ee4b021d18ee23aa9e9f59a0dc314fab;hpb=4c509656223d3ed1f0fab504cb483090d38972f9;p=ardour.git

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index a5c6b210ee..7c2297448b 100644
--- a/libs/ardour/recent_sessions.cc
+++ b/libs/ardour/recent_sessions.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,28 +17,38 @@
 
 */
 
+#include <cstring>
 #include <cerrno>
-#include <unistd.h>
 #include <fstream>
 #include <algorithm>
-#include <pbd/error.h>
-#include <ardour/configuration.h>
-#include <ardour/recent_sessions.h>
-#include <ardour/utils.h>
-#include "i18n.h"
 
+#include <glibmm/miscutils.h>
+
+#include "pbd/error.h"
+
+#include "ardour/rc_configuration.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/recent_sessions.h"
+
+#include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
+
+namespace {
+
+	const char * const recent_file_name = "recent";
+
+} // anonymous
 
 int
 ARDOUR::read_recent_sessions (RecentSessions& rs)
 {
-	string path = Config->get_user_ardour_path();
-	path += "/recent";
+	std::string path = Glib::build_filename (user_config_directory(), recent_file_name);
 
 	ifstream recent (path.c_str());
-	
+
 	if (!recent) {
 		if (errno != ENOENT) {
 			error << string_compose (_("cannot open recent session file %1 (%2)"), path, strerror (errno)) << endmsg;
@@ -57,21 +67,16 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
 		if (!recent.good()) {
 			break;
 		}
-		
+
 		getline(recent, newpair.second);
 
 		if (!recent.good()) {
 			break;
 		}
 
-		if (!access(newpair.second.c_str(), R_OK)) {
-			rs.push_back (newpair);
-		}
+		rs.push_back (newpair);
 	}
 
-	// This deletes any missing sessions
-	ARDOUR::write_recent_sessions (rs);
-
 	/* display sorting should be done in the GUI, otherwise the
 	 * natural order will be broken
 	 */
@@ -82,8 +87,7 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
 int
 ARDOUR::write_recent_sessions (RecentSessions& rs)
 {
-	string path = Config->get_user_ardour_path();
-	path += "/recent";
+	std::string path = Glib::build_filename (user_config_directory(), recent_file_name);
 
 	ofstream recent (path.c_str());
 
@@ -94,10 +98,10 @@ ARDOUR::write_recent_sessions (RecentSessions& rs)
 	for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
 		recent << (*i).first << '\n' << (*i).second << endl;
 	}
-	
+
 	return 0;
 }
-	
+
 int
 ARDOUR::store_recent_sessions (string name, string path)
 {
@@ -113,13 +117,40 @@ ARDOUR::store_recent_sessions (string name, string path)
 	newpair.second = path;
 
 	rs.erase(remove(rs.begin(), rs.end(), newpair), rs.end());
-	
+
 	rs.push_front (newpair);
 
-	if (rs.size() > 10) {
-		rs.erase(rs.begin()+10, rs.end());
+	uint32_t max_recent_sessions = Config->get_max_recent_sessions();
+
+	if (rs.size() > max_recent_sessions) {
+		rs.erase(rs.begin()+max_recent_sessions, rs.end());
 	}
 
 	return ARDOUR::write_recent_sessions (rs);
 }
 
+int
+ARDOUR::remove_recent_sessions (const string& path)
+{
+	RecentSessions rs;
+	bool write = false;
+
+	if (ARDOUR::read_recent_sessions (rs) < 0) {
+		return -1;
+	}
+
+	for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
+		if (i->second == path) {
+			rs.erase (i);
+			write = true;
+			break;
+		}
+	}
+
+	if (write) {
+		return ARDOUR::write_recent_sessions (rs);
+	} else {
+		return 1;
+	}
+}
+