allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Remove ifstream / ofstream when accessing session template files (or creating a new session from a template file)

Browse Source 
On Windows, the above classes don't support UTF-8 so let's get rid of them and use g_fopen / stringstream / fwrite() etc.
This commit is contained in:
John Emmas
2015-09-15 13:17:22 +01:00
parent 11c0adfbae
commit 551e20b926
2 changed files with 76 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
libs/ardour/recent_sessions.cc
View File

@@ -108,18 +108,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 +148,7 @@ ARDOUR::read_recent_templates (std::deque<std::string>& rt)
rt.push_back (session_template_full_name);
}
fclose (fin);
return 0;
}
@@ -181,18 +197,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);
FILE* fout = g_fopen (Glib::build_filename (user_config_directory(), recent_templates_file_name).c_str(), "wb");
std::ofstream recent (path.c_str());
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;
}

48
libs/ardour/session_state.cc
View File

@@ -538,9 +538,9 @@ Session::create (const string& session_template, BusProfile* bus_profile)
_writable = exists_and_writable (_path);
if (!session_template.empty()) {
std::string in_path = (ARDOUR::Profile->get_trx () ? session_template : session_template_dir_to_file (session_template));
string in_path = (ARDOUR::Profile->get_trx () ? session_template : session_template_dir_to_file (session_template));
ifstream in(in_path.c_str());
FILE* in = g_fopen (in_path.c_str(), "rb");
if (in) {
/* no need to call legalize_for_path() since the string
@@ -548,23 +548,51 @@ Session::create (const string& session_template, BusProfile* bus_profile)
*/
string out_path = Glib::build_filename (_session_dir->root_path(), _name + statefile_suffix);
ofstream out(out_path.c_str());
FILE* out = g_fopen (out_path.c_str(), "wb");
if (out) {
out << in.rdbuf();
_is_new = false;
char buf[1024];
stringstream new_session;
if (!ARDOUR::Profile->get_trx()) {
/* Copy plugin state files from template to new session */
std::string template_plugins = Glib::build_filename (session_template, X_("plugins"));
copy_recurse (template_plugins, plugins_dir ());
}
while (!feof (in)) {
size_t charsRead = fread (buf, sizeof(char), 1024, in);
if (ferror (in)) {
error << string_compose (_("Error reading session template file %1 (%2)"), in_path, strerror (errno)) << endmsg;
fclose (in);
fclose (out);
return -1;
}
if (charsRead == 0) {
break;
}
new_session.write (buf, charsRead);
}
fclose (in);
string file_contents = new_session.str();
size_t writeSize = file_contents.length();
if (fwrite (file_contents.c_str(), sizeof(char), writeSize, out) != writeSize) {
error << string_compose (_("Error writing session template file %1 (%2)"), out_path, strerror (errno)) << endmsg;
fclose (out);
return -1;
}
fclose (out);
_is_new = false;
if (!ARDOUR::Profile->get_trx()) {
/* Copy plugin state files from template to new session */
std::string template_plugins = Glib::build_filename (session_template, X_("plugins"));
copy_recurse (template_plugins, plugins_dir ());
}
return 0;
} else {
error << string_compose (_("Could not open %1 for writing session template"), out_path)
<< endmsg;
fclose(in);
return -1;
}