remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths...

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

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index 954162dd183547c3589ef964fe5aa7d724a92481..dfe85190b3e12410f67ec8fe9810eff5a2333c35 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
@@ -17,28 +17,44 @@
 
 */
 
+#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 <glibmm/miscutils.h>
+
+#include "pbd/error.h"
+
+#include "ardour/configuration.h"
+#include "ardour/filesystem_paths.h"
+#include "ardour/recent_sessions.h"
+#include "ardour/utils.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 = get_user_ardour_path();
-       path += "/recent";
+       sys::path recent_file_path(user_config_directory());
+
+       recent_file_path /= recent_file_name;
+
+       const string path = recent_file_path.to_string();
 
        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 +73,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 +93,11 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
 int
 ARDOUR::write_recent_sessions (RecentSessions& rs)
 {
-       string path = get_user_ardour_path();
-       path += "/recent";
+       sys::path recent_file_path(user_config_directory());
+
+       recent_file_path /= recent_file_name;
+
+       const string path = recent_file_path.to_string();
 
        ofstream recent (path.c_str());
 
@@ -94,10 +108,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,7 +127,7 @@ 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) {