X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frecent_sessions.cc;h=7458c32ff8ac979ed7e937aacd3006c68be77e67;hb=9458fce148c862f5504d88754d5418972dd4046b;hp=29cec8a9a21090a0e92a98fad4680492c3aefab2;hpb=5f4e9c77531c963ff6e66724bd287786eb998202;p=ardour.git

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index 29cec8a9a2..7458c32ff8 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,31 +17,42 @@
 
 */
 
+#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";
+	const char * const recent_templates_file_name = "recent_templates";
+
+} // 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 << compose (_("cannot open recent session file %1 (%2)"), path, strerror (errno)) << endmsg;
+			error << string_compose (_("cannot open recent session file %1 (%2)"), path, strerror (errno)) << endmsg;
 			return -1;
 		} else {
 			return 1;
@@ -57,21 +68,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
 	 */
@@ -79,11 +85,42 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
 	return 0;
 }
 
+int
+ARDOUR::read_recent_templates (std::deque<std::string>& rt)
+{
+	std::string path = Glib::build_filename (user_config_directory(), recent_templates_file_name);
+
+	ifstream recent (path.c_str());
+
+	if (!recent) {
+		if (errno != ENOENT) {
+			error << string_compose (_("cannot open recent template file %1 (%2)"), path, strerror (errno)) << endmsg;
+			return -1;
+		} else {
+			return 1;
+		}
+	}
+
+	while (true) {
+
+		std::string session_template_full_name;
+
+		getline(recent, session_template_full_name);
+
+		if (!recent.good()) {
+			break;
+		}
+
+		rt.push_back (session_template_full_name);
+	}
+
+	return 0;
+}
+
 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 +131,28 @@ 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::write_recent_templates (std::deque<std::string>& rt)
+{
+	std::string path = Glib::build_filename (user_config_directory(), recent_templates_file_name);
+
+	std::ofstream recent (path.c_str());
+
+	if (!recent) {
+		return -1;
+	}
+
+	for (std::deque<std::string>::const_iterator i = rt.begin(); i != rt.end(); ++i) {
+		recent << (*i) << std::endl;
+	}
+
 	return 0;
 }
-	
+
 int
 ARDOUR::store_recent_sessions (string name, string path)
 {
@@ -113,13 +168,62 @@ 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::store_recent_templates (const std::string& session_template_full_name)
+{
+	std::deque<std::string> rt;
+
+	if (ARDOUR::read_recent_templates (rt) < 0) {
+		return -1;
+	}
+
+	rt.erase(remove (rt.begin(), rt.end(), session_template_full_name), rt.end());
+
+	rt.push_front (session_template_full_name);
+
+	uint32_t max_recent_templates = Config->get_max_recent_templates ();
+
+	if (rt.size() > max_recent_templates) {
+		rt.erase( rt.begin() + max_recent_templates, rt.end ());
+	}
+
+	return ARDOUR::write_recent_templates (rt);
+}
+
+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;
+	}
+}
+