X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frecent_sessions.cc;h=dfe85190b3e12410f67ec8fe9810eff5a2333c35;hb=932d6c79d01be93f491415ef1491bca17d92671f;hp=cfb8d5bf2e73e6243e4f6d088ae4de260791dda1;hpb=e71ec730bf6b114ce95dfc581411e2cf3737f36c;p=ardour.git diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc index cfb8d5bf2e..dfe85190b3 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,15 +17,20 @@ */ +#include #include #include #include #include -#include -#include -#include -#include -#include + +#include + +#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" @@ -45,11 +50,11 @@ 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(); ifstream recent (path.c_str()); - + if (!recent) { if (errno != ENOENT) { error << string_compose (_("cannot open recent session file %1 (%2)"), path, strerror (errno)) << endmsg; @@ -68,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 */ @@ -96,7 +96,7 @@ 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(); ofstream recent (path.c_str()); @@ -108,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) { @@ -127,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) {