fix error reporting for a realpath(2) error

[ardour.git] / libs / ardour / recent_sessions.cc

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index 7d62300e3d6fc96338830029acc63f0b6f4b6353..7c2297448b505d29f06161b13d7b1b17278402f6 100644 (file)
--- 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
@@ -19,7 +19,6 @@
 
 #include <cstring>
 #include <cerrno>
-#include <unistd.h>
 #include <fstream>
 #include <algorithm>
 
@@ -27,10 +26,9 @@
 
 #include "pbd/error.h"
 
-#include "ardour/configuration.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 
@@ -47,14 +45,10 @@ namespace {
 int
 ARDOUR::read_recent_sessions (RecentSessions& rs)
 {
-       sys::path recent_file_path(user_config_directory());
-
-       recent_file_path /= recent_file_name;
-       
-       const string path = recent_file_path.to_string();
+       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;
@@ -73,7 +67,7 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
                if (!recent.good()) {
                        break;
                }
-               
+
                getline(recent, newpair.second);
 
                if (!recent.good()) {
@@ -93,11 +87,7 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
 int
 ARDOUR::write_recent_sessions (RecentSessions& rs)
 {
-       sys::path recent_file_path(user_config_directory());
-
-       recent_file_path /= recent_file_name;
-       
-       const string path = recent_file_path.to_string();
+       std::string path = Glib::build_filename (user_config_directory(), recent_file_name);
 
        ofstream recent (path.c_str());
 
@@ -108,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)
 {
@@ -127,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;
+       }
+}
+