[SCM] audacity/master: Unapply all patches.

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

The following commit has been merged in the master branch:
commit 4c0c9c52067cfe1b7426952f62b65f0863d6c20d
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Tue Sep 21 14:58:10 2010 +0200

    Unapply all patches.
    
    Git-Dch: Ignore

diff --git a/lib-src/portmixer/src/px_linux_alsa.c b/lib-src/portmixer/src/px_linux_alsa.c
index c762bd0..2b4e70f 100644
--- a/lib-src/portmixer/src/px_linux_alsa.c
+++ b/lib-src/portmixer/src/px_linux_alsa.c
@@ -136,10 +136,7 @@ static int open_mixer(PxDev *dev, int card, int playback)
                dev->numselems++;
             }
             else if (snd_mixer_selem_is_enum_capture(elem)) {
-               int retval = snd_mixer_selem_get_enum_items(elem);
-
-               if (retval > 0)
-                  dev->numselems += retval;
+               dev->numselems += snd_mixer_selem_get_enum_items(elem);
             }
          }
       }
@@ -199,15 +196,12 @@ static int open_mixer(PxDev *dev, int card, int playback)
             i++;
          }
          else if (snd_mixer_selem_is_enum_capture(elem)) {
-            int j;
-            int cnt = snd_mixer_selem_get_enum_items(elem);
-
-            if (cnt < 0)
-               continue;
+            unsigned int cnt = snd_mixer_selem_get_enum_items(elem);
+            unsigned int j;
 
             for (j = 0; j < cnt; j++) {
                char iname[256];
-               snd_mixer_selem_get_enum_item_name(elem, (unsigned int) j, sizeof(iname), iname);
+               snd_mixer_selem_get_enum_item_name(elem, j, sizeof(iname), iname);
                snprintf(name,
                         sizeof(name),
                         "%s:%d",
diff --git a/src/Experimental.h b/src/Experimental.h
index 7b6ea6b..45e783a 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -28,7 +28,7 @@
 #define __EXPERIMENTAL__
 
 //uncomment the next line to enable the feature to link audio tracks to a label track
-#define EXPERIMENTAL_LINKING
+//#define EXPERIMENTAL_LINKING
 
 //Uncomment the next #define to enable experimental features.
 #define EXPERIMENTAL_FEATURES
diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp
index d7c2a24..57b71ca 100644
--- a/src/widgets/ASlider.cpp
+++ b/src/widgets/ASlider.cpp
@@ -62,7 +62,6 @@ of an LWSlider or ASlider.
 #include <wx/button.h>
 #include <wx/statline.h>
 #include <wx/sizer.h>
-#include <wx/settings.h>
 
 #if defined(__WXMSW__) && !defined(__CYGWIN__)
 #define USE_POPUPWIN 1
@@ -675,7 +674,7 @@ void LWSlider::Draw()
    TransparentColour = theTheme.Colour( clrTrackInfo );
 #endif
 
-   dc->SetBackground( wxBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_BACKGROUND ) ) );
+   dc->SetBackground( wxBrush( TransparentColour  ) );
    dc->Clear();
 
    // Draw the line along which the thumb moves.

-- 
Audacity debian packaging