revert inadvertently committed debug settings

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

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index f19c0d8d37a80ea3a6380369ddae3f4873e9dc00..fd0b9b1b1d3127f84ae0edd9210e285ca04786a2 100644 (file)
--- a/libs/ardour/recent_sessions.cc
+++ b/libs/ardour/recent_sessions.cc
@@ -19,12 +19,10 @@
 
 #include <cstring>
 #include <cerrno>
-#include <fstream>
-#include <iostream>
 #include <sstream>
 #include <algorithm>
 
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 #include <glibmm/miscutils.h>
 
 #include "pbd/error.h"
@@ -33,7 +31,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -108,18 +106,33 @@ int
 ARDOUR::read_recent_templates (std::deque<std::string>& rt)
 {
        std::string path = Glib::build_filename (user_config_directory(), recent_templates_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 template file %1 (%2)"), path, strerror (errno)) << endmsg;
+                       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;
@@ -133,6 +146,7 @@ ARDOUR::read_recent_templates (std::deque<std::string>& rt)
                rt.push_back (session_template_full_name);
        }
 
+       fclose (fin);
        return 0;
 }
 
@@ -147,12 +161,6 @@ ARDOUR::write_recent_sessions (RecentSessions& rs)
 
        {
                stringstream recent;
-               //ofstream recent (fout);
-
-               // if (!recent) {
-               //      fclose (fout);
-               //      return -1;
-               // }
 
                for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
                        recent << (*i).first << '\n' << (*i).second << endl;
@@ -181,18 +189,32 @@ ARDOUR::write_recent_sessions (RecentSessions& rs)
 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());
+       FILE* fout = g_fopen (Glib::build_filename (user_config_directory(), recent_templates_file_name).c_str(), "wb");
 
-       if (!recent) {
+       if (!fout) {
                return -1;
        }
 
+       stringstream recent;
+
        for (std::deque<std::string>::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;
 }