# HG changeset patch
# User Chris Cannam
# Date 1308059408 -3600
# Node ID 9de86c1b980e7b494965ffa1a617bde048693a1b
# Parent  5f22e0bbe4ba254dfb2d2c262d0539b174694457# Parent  ae68fc09bf165f2bbed38ccddd7907e9a39c608a
Merge from debug-output branch

diff -r ae68fc09bf16 -r 9de86c1b980e main/MainWindow.cpp
--- a/main/MainWindow.cpp	Mon May 16 17:19:56 2011 +0100
+++ b/main/MainWindow.cpp	Tue Jun 14 14:50:08 2011 +0100
@@ -2306,7 +2306,8 @@
 
 		WavFileWriter subwriter(subpath,
                                         model->getSampleRate(),
-                                        model->getChannelCount());
+                                        model->getChannelCount(),
+                                        WavFileWriter::WriteToTemporary);
                 subwriter.writeModel(model, &subms);
 		ok = subwriter.isOK();
 
@@ -2321,7 +2322,8 @@
     if (!multiple) {
         WavFileWriter writer(path,
                              model->getSampleRate(),
-                             model->getChannelCount());
+                             model->getChannelCount(),
+                             WavFileWriter::WriteToTemporary);
         writer.writeModel(model, selectionToWrite);
 	ok = writer.isOK();
 	error = writer.getError();
diff -r ae68fc09bf16 -r 9de86c1b980e main/OSCHandler.cpp
--- a/main/OSCHandler.cpp	Mon May 16 17:19:56 2011 +0100
+++ b/main/OSCHandler.cpp	Tue Jun 14 14:50:08 2011 +0100
@@ -106,7 +106,8 @@
                 } else {
                     WavFileWriter writer(path,
                                          getMainModel()->getSampleRate(),
-                                         getMainModel()->getChannelCount());
+                                         getMainModel()->getChannelCount(),
+                                         WavFileWriter::WriteToTemporary);
                     MultiSelection ms = m_viewManager->getSelection();
                     if (!ms.getSelections().empty()) {
                         writer.writeModel(getMainModel(), &ms);