[SCM] Audacity debian packaging branch, master, updated. debian/1.3.7-3-48-gc688e97

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

The following commit has been merged in the master branch:
commit c688e97a8a4e55a1a0c96e9258dcd326ecda8608
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Sat Sep 26 16:02:46 2009 +0200

    Add debian/patches/switch-hostapi-crash.patch.
    
    Prevent crash when selecting sound card driver; thanks to David
    Henningsson for the patch (LP: #436990).

diff --git a/debian/changelog b/debian/changelog
index c4c3dcf..216fccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+audacity (1.3.9-4) unstable; urgency=low
+
+  * Add debian/patches/switch-hostapi-crash.patch to prevent crash when
+    selecting sound card driver; thanks to David Henningsson for the patch
+    (LP: #436990).
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Sat, 26 Sep 2009 15:58:39 +0200
+
 audacity (1.3.9-3) unstable; urgency=low
 
   * Add debian/patches/gsocket.patch to fix conflicting GSocket definition.
diff --git a/debian/patches/switch-hostapi-crash.patch b/debian/patches/switch-hostapi-crash.patch
new file mode 100644
index 0000000..8c7c187
--- /dev/null
+++ b/debian/patches/switch-hostapi-crash.patch
@@ -0,0 +1,31 @@
+Description: Protect against Pa_GetDeviceInfo returning null sometimes.
+ Please see https://launchpad.net/bugs/436990 for thoughts about the underlying
+ issue.
+Bug-Ubuntu: https://launchpad.net/bugs/436990
+Forwarded: yes
+Author: David Henningsson <launchpad.web at epost.diwic.se>
+diff -Nur -x '*.orig' -x '*~' audacity-1.3.9/src/prefs/DevicePrefs.cpp audacity-1.3.9.new/src/prefs/DevicePrefs.cpp
+--- audacity-1.3.9/src/prefs/DevicePrefs.cpp	2009-08-31 12:45:38.000000000 +0200
++++ audacity-1.3.9.new/src/prefs/DevicePrefs.cpp	2009-09-26 10:30:10.717880112 +0200
+@@ -301,6 +301,10 @@
+    wxLogDebug(wxT("GetDefaultPlayDevice(): HostAPI index %d, name %s"), index, wxString(apiinfo->name, wxConvLocal).c_str());
+    wxLogDebug(wxT("GetDefaultPlayDevice() default output %d"), apiinfo->defaultOutputDevice);
+    const PaDeviceInfo* devinfo = Pa_GetDeviceInfo(apiinfo->defaultOutputDevice);
++   if (devinfo == NULL) {
++     wxLogDebug(wxT("GetDefaultPlayDevice() no default output device"));
++     return wxString("", wxConvLocal);
++   }
+    wxString name(devinfo->name, wxConvLocal);
+    wxLogDebug(wxT("GetDefaultPlayDevice() default output device name %s"), name.c_str());
+    return name;
+@@ -313,6 +317,10 @@
+    wxLogDebug(wxT("GetDefaultRecordDevice(): HostAPI index %d, name %s"), index, wxString(apiinfo->name, wxConvLocal).c_str());
+    wxLogDebug(wxT("GetDefaultRecordDevice() default input %d"), apiinfo->defaultInputDevice);
+    const PaDeviceInfo* devinfo = Pa_GetDeviceInfo(apiinfo->defaultInputDevice);
++   if (devinfo == NULL) {
++     wxLogDebug(wxT("GetDefaultRecordDevice() no default input device"));
++     return wxString("", wxConvLocal);
++   }
+    wxString name(devinfo->name, wxConvLocal);
+    wxLogDebug(wxT("GetDefaultRecordDevice() default input device name %s"), name.c_str());
+    return name;

-- 
Audacity debian packaging