X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Frecent_sessions.cc;h=39d517cff8ec57f4028b1b59c22cea7bf6e2cb4b;hb=c7ff67004a51ae3f0453531c3d64bd9876f1df3b;hp=7c2297448b505d29f06161b13d7b1b17278402f6;hpb=8cb88c8c2e6f605342b373ebaad5bbd4334ec7e8;p=ardour.git diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc index 7c2297448b..39d517cff8 100644 --- a/libs/ardour/recent_sessions.cc +++ b/libs/ardour/recent_sessions.cc @@ -19,9 +19,10 @@ #include #include -#include +#include #include +#include "pbd/gstdio_compat.h" #include #include "pbd/error.h" @@ -39,6 +40,7 @@ using namespace PBD; namespace { const char * const recent_file_name = "recent"; + const char * const recent_templates_file_name = "recent_templates"; } // anonymous @@ -46,10 +48,9 @@ int ARDOUR::read_recent_sessions (RecentSessions& rs) { std::string path = Glib::build_filename (user_config_directory(), recent_file_name); + FILE* fin = g_fopen (path.c_str(), "rb"); - ifstream recent (path.c_str()); - - if (!recent) { + if (!fin) { if (errno != ENOENT) { error << string_compose (_("cannot open recent session file %1 (%2)"), path, strerror (errno)) << endmsg; return -1; @@ -58,6 +59,22 @@ ARDOUR::read_recent_sessions (RecentSessions& rs) } } + // Read the file into a std::string + std::stringstream recent; + while (!feof (fin)) { + char buf[1024]; + size_t charsRead = fread (buf, sizeof(char), 1024, fin); + if (ferror (fin)) { + error << string_compose (_("Error reading recent session file %1 (%2)"), path, strerror (errno)) << endmsg; + fclose(fin); + return -1; + } + if (charsRead == 0) { + break; + } + recent.write (buf, charsRead); + } + while (true) { pair newpair; @@ -81,24 +98,123 @@ ARDOUR::read_recent_sessions (RecentSessions& rs) * natural order will be broken */ + fclose (fin); + return 0; +} + +int +ARDOUR::read_recent_templates (std::deque& rt) +{ + std::string path = Glib::build_filename (user_config_directory(), recent_templates_file_name); + FILE* fin = g_fopen (path.c_str(), "rb"); + + if (!fin) { + if (errno != ENOENT) { + error << string_compose (_("Cannot open recent template file %1 (%2)"), path, strerror (errno)) << endmsg; + return -1; + } else { + return 1; + } + } + + // Copy the file contents into a std::stringstream + std::stringstream recent; + while (!feof (fin)) { + char buf[1024]; + size_t charsRead = fread (buf, sizeof(char), 1024, fin); + if (ferror (fin)) { + error << string_compose (_("Error reading recent session file %1 (%2)"), path, strerror (errno)) << endmsg; + fclose(fin); + return -1; + } + if (charsRead == 0) { + break; + } + recent.write (buf, charsRead); + } + + 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); + } + + fclose (fin); return 0; } int ARDOUR::write_recent_sessions (RecentSessions& rs) { - std::string path = Glib::build_filename (user_config_directory(), recent_file_name); + FILE* fout = g_fopen (Glib::build_filename (user_config_directory(), recent_file_name).c_str(), "wb"); + + if (!fout) { + return -1; + } - ofstream recent (path.c_str()); + { + stringstream recent; - if (!recent) { + for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) { + recent << (*i).first << '\n' << (*i).second << endl; + } + + string recentString = recent.str(); + size_t writeSize = recentString.length(); + + fwrite(recentString.c_str(), sizeof(char), writeSize, fout); + + if (ferror(fout)) + { + error << string_compose (_("Error writing recent sessions file %1 (%2)"), recent_file_name, strerror (errno)) << endmsg; + fclose(fout); + return -1; + } + } + + + + fclose (fout); + + return 0; +} + +int +ARDOUR::write_recent_templates (std::deque& rt) +{ + FILE* fout = g_fopen (Glib::build_filename (user_config_directory(), recent_templates_file_name).c_str(), "wb"); + + if (!fout) { return -1; } - for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) { - recent << (*i).first << '\n' << (*i).second << endl; + stringstream recent; + + for (std::deque::const_iterator i = rt.begin(); i != rt.end(); ++i) { + recent << (*i) << std::endl; } + string recentString = recent.str(); + size_t writeSize = recentString.length(); + + fwrite(recentString.c_str(), sizeof(char), writeSize, fout); + + if (ferror(fout)) + { + error << string_compose (_("Error writing saved template file %1 (%2)"), recent_templates_file_name, strerror (errno)) << endmsg; + fclose(fout); + return -1; + } + + fclose (fout); + return 0; } @@ -129,6 +245,28 @@ ARDOUR::store_recent_sessions (string name, string path) return ARDOUR::write_recent_sessions (rs); } +int +ARDOUR::store_recent_templates (const std::string& session_template_full_name) +{ + std::deque 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) { @@ -153,4 +291,3 @@ ARDOUR::remove_recent_sessions (const string& path) return 1; } } -