diff options
author | John Emmas <johne53@tiscali.co.uk> | 2015-09-15 13:17:22 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2015-09-15 13:17:22 +0100 |
commit | 551e20b926e164b3579d5e6b39f5e2fcb1ced93e (patch) | |
tree | 0e38cdbc78585472e3b6d95aaa8b27276402cca4 /libs/ardour/session_state.cc | |
parent | 11c0adfbaea119f5eeb26335335ed39ede27c6c7 (diff) |
Remove ifstream / ofstream when accessing session template files (or creating a new session from a template file)
On Windows, the above classes don't support UTF-8 so let's get rid of them and use g_fopen / stringstream / fwrite() etc.
Diffstat (limited to 'libs/ardour/session_state.cc')
-rw-r--r-- | libs/ardour/session_state.cc | 50 |
1 files changed, 39 insertions, 11 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 562db87ef3..f893c18a1b 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -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; - - 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 ()); - } + char buf[1024]; + stringstream new_session; + + 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; } |