smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

Use glib to open our 'recent file' list, rather than opening directly with ifstream / ofstream

Browse source 
(on Windows, ifstream & ofstream don't support UTF8)
This commit is contained in:
John Emmas 2015-09-08 15:43:23 +01:00
parent d0fdcf2848
commit dee324cc36
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libs/ardour/recent_sessions.cc
View file

@ -20,8 +20,10 @@
#include <cstring>
#include <cerrno>
#include <fstream>
#include <iostream>
#include <algorithm>
#include <glib/gstdio.h>
#include <glibmm/miscutils.h>
#include "pbd/error.h"
@ -47,10 +49,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;
@ -59,6 +60,8 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
}
}
ifstream recent (fin);
while (true) {
pair<string,string> newpair;
@ -82,6 +85,7 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
* natural order will be broken
*/
fclose (fin);
return 0;
}
@ -120,18 +124,27 @@ ARDOUR::read_recent_templates (std::deque<std::string>& rt)
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");
ofstream recent (path.c_str());
if (!recent) {
if (!fout) {
return -1;
}
for (RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
recent << (*i).first << '\n' << (*i).second << endl;
{
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;
}
}
fclose (fout);
return 0;
}