#include "pbd/debug.h"
#include "pbd/enumwriter.h"
#include "pbd/error.h"
-#include "pbd/file_archive.h"
#include "pbd/file_utils.h"
#include "pbd/pathexpand.h"
#include "pbd/pthread_utils.h"
std::string tmp_path(_session_dir->root_path());
tmp_path = Glib::build_filename (tmp_path, legalize_for_path (snapshot_name) + temp_suffix);
+#ifndef NDEBUG
cerr << "actually writing state to " << tmp_path << endl;
+#endif
if (!tree.write (tmp_path)) {
error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg;
} else {
+#ifndef NDEBUG
cerr << "renaming state to " << xml_path << endl;
+#endif
if (::g_rename (tmp_path.c_str(), xml_path.c_str()) != 0) {
error << string_compose (_("could not rename temporary session file %1 to %2 (%3)"),
}
/* prepare archive */
- string archive = Glib::build_filename (dest, name + ".tar.xz");
+ string archive = Glib::build_filename (dest, name + session_archive_suffix);
PBD::ScopedConnectionList progress_connection;
PBD::FileArchive ar (archive);
orig_gain[afs] = afs->gain();
std::string new_path = make_new_media_path (afs->path (), to_dir, name);
- new_path = Glib::build_filename (Glib::path_get_dirname (new_path), PBD::basename_nosuffix (new_path) + ".flac");
+
+ std::string channelsuffix = "";
+ if (afs->channel() > 0) { /* n_channels() is /wrongly/ 1. */
+ /* embedded external multi-channel files are converted to multiple-mono */
+ channelsuffix = string_compose ("-c%1", afs->channel ());
+ }
+ new_path = Glib::build_filename (Glib::path_get_dirname (new_path), PBD::basename_nosuffix (new_path) + channelsuffix + ".flac");
g_mkdir_with_parents (Glib::path_get_dirname (new_path).c_str (), 0755);
+
if (progress) {
progress->descend ((float)afs->readable_length () / total_size);
}
#ifdef LV2_SUPPORT
PBD::Unwinder<bool> uw (LV2Plugin::force_state_save, true);
#endif
- save_state (name);
+ save_state (name, /*pending, don't fork MIDI, don't mark clean */ true);
+
+#ifndef NDEBUG
+ cerr << "archiving state from "
+ << Glib::build_filename (to_dir, legalize_for_path (name) + pending_suffix)
+ << " to "
+ << Glib::build_filename (to_dir, legalize_for_path (name) + statefile_suffix)
+ << endl;
+#endif
+
+ ::g_rename (
+ Glib::build_filename (to_dir, legalize_for_path (name) + pending_suffix).c_str(),
+ Glib::build_filename (to_dir, legalize_for_path (name) + statefile_suffix).c_str());
+
save_default_options ();
size_t prefix_len = _path.size();
i->first->set_gain (i->second, true);
}
- int rv = ar.create (filemap);
+ int rv = ar.create (filemap, PBD::FileArchive::CompressGood);
remove_directory (to_dir);
return rv;
assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS));
- _channel = other.channel ();
+ _channel = 0;
init_sndfile ();
_file_is_new = true;
- _info.channels = other.n_channels();
+ _info.channels = 1;
_info.samplerate = other.sample_rate ();
_info.format = SF_FORMAT_FLAC | (use16bits ? SF_FORMAT_PCM_16 : SF_FORMAT_PCM_24);
float norm = 1.f;
/* normalize before converting to fixed point, calc gain factor */
- samplecnt_t len = other.read (buf, off, 8192, /*channel*/0);
+ samplecnt_t len = other.read (buf, off, 8192, other.channel ());
while (len > 0) {
peak = compute_peak (buf, len, peak);
off += len;
- len = other.read (buf, off, 8192, /*channel*/0);
+ len = other.read (buf, off, 8192, other.channel ());
if (progress) {
progress->set_progress (0.5f * (float) off / other.readable_length ());
}
/* copy file */
off = 0;
- len = other.read (buf, off, 8192, /*channel*/0);
+ len = other.read (buf, off, 8192, other.channel ());
while (len > 0) {
if (norm != 1.f) {
for (samplecnt_t i = 0; i < len; ++i) {
}
write (buf, len);
off += len;
- len = other.read (buf, off, 8192, /*channel*/0);
+ len = other.read (buf, off, 8192, other.channel ());
if (progress) {
progress->set_progress (0.5f + 0.5f * (float) off / other.readable_length ());
}