changeset 694:959f01137742 tony_integration

Merge subrepos from tonioni
author Chris Cannam
date Tue, 28 Jan 2014 15:17:06 +0000 (2014-01-28)
parents c764dd0df6ec
children 9cc2027d388b
files .hgsubstate main/MainWindow.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Dec 13 09:39:04 2013 +0000
+++ b/.hgsubstate	Tue Jan 28 15:17:06 2014 +0000
@@ -1,5 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
-c837368b1faf2cd3727242099eefec0a18deb91f svapp
-786ee8d1f30e4920f361419a75eafa079ec0160d svcore
-b81f21f2c4c3d1cb115e278a098ac4869fb7377f svgui
+28c17ce7a6e976d3bddc11f520b6f5715083393f svapp
+862fe7b20df76ec3e57d1110c5a064940ae5de35 svcore
+e5f4385615ac87c8cc9d93fd453b0f91add6a486 svgui
--- a/main/MainWindow.cpp	Fri Dec 13 09:39:04 2013 +0000
+++ b/main/MainWindow.cpp	Tue Jan 28 15:17:06 2014 +0000
@@ -2648,7 +2648,7 @@
         if (!nm) {
             error = tr("Can't export non-note layers to MIDI");
         } else {
-            MIDIFileWriter writer(path, nm);
+            MIDIFileWriter writer(path, nm, nm->getSampleRate());
             writer.write();
             if (!writer.isOK()) {
                 error = writer.getError();