[SCM] Audacity debian packaging branch, master, updated. debian/1.3.7-3-49-g5bcc74d

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5bcc74d2bc2066cb8af0f74edc31c449f7366646
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Sun Oct 11 18:41:19 2009 +0200

    Add debian/patches/disk-full-on-export.patch.
    
    Show an error message if the disk gets full on PCM export; thanks to David
    Henningsson for the patch (LP: #259798).

diff --git a/debian/changelog b/debian/changelog
index 216fccd..525b83b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+audacity (1.3.9-5) unstable; urgency=low
+
+  * Add debian/patches/disk-full-on-export.patch to show an error message if
+    the disk gets full on PCM export; thanks to David Henningsson for the patch
+    (LP: #259798).
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sun, 11 Oct 2009 17:52:06 +0200
+
 audacity (1.3.9-4) unstable; urgency=low
 
   * Add debian/patches/switch-hostapi-crash.patch to prevent crash when
diff --git a/debian/patches/disk-full-on-export.patch b/debian/patches/disk-full-on-export.patch
new file mode 100644
index 0000000..0e69992
--- /dev/null
+++ b/debian/patches/disk-full-on-export.patch
@@ -0,0 +1,40 @@
+Description: No error message is given when disk gets full on PCM export
+ Please also have a look at the error message on sf_close and see that it
+ actually works.
+Bug-Ubuntu: https://launchpad.net/bugs/259798
+Forwarded: yes
+Author: David Henningsson <launchpad.web at epost.diwic.se>
+diff -Nur -x '*.orig' -x '*~' audacity-1.3.9/src/export/ExportPCM.cpp audacity-1.3.9.new/src/export/ExportPCM.cpp
+--- audacity-1.3.9/src/export/ExportPCM.cpp	2009-10-11 10:24:55.418303300 +0200
++++ audacity-1.3.9.new/src/export/ExportPCM.cpp	2009-10-11 10:28:05.589104320 +0200
+@@ -529,6 +529,7 @@
+                        formatStr.c_str()));
+ 
+    while(updateResult == eProgressSuccess) {
++      sampleCount samplesWritten;
+       sampleCount numSamples = mixer->Process(maxBlockLen);
+ 
+       if (numSamples == 0)
+@@ -538,11 +539,20 @@
+ 
+       ODManager::LockLibSndFileMutex();
+       if (format == int16Sample)
+-         sf_writef_short(sf, (short *)mixed, numSamples);
++         samplesWritten = sf_writef_short(sf, (short *)mixed, numSamples);
+       else
+-         sf_writef_float(sf, (float *)mixed, numSamples);
++         samplesWritten = sf_writef_float(sf, (float *)mixed, numSamples);
+       ODManager::UnlockLibSndFileMutex();
+ 
++      if (samplesWritten != numSamples) {
++        char buffer2[1000];
++        sf_error_str(sf, buffer2, 1000);
++        /* Tried the format %s variant (like below) but got garbage, probably it depends on 
++           Audacity and/or libsndfile being compiled with unicode or not */
++        wxMessageBox(_("Error while writing file (disk full?): ") + wxString::FromAscii(buffer2));
++        break;
++      }
++
+       updateResult = progress->Update(mixer->MixGetCurrentTime()-t0, t1-t0);
+    }
+ 

-- 
Audacity debian packaging