diff -urN gst-plugins-base-0.10.5.org/ext/alsa/gstalsamixer.c gst-plugins-base-0.10.5/ext/alsa/gstalsamixer.c
--- gst-plugins-base-0.10.5.org/ext/alsa/gstalsamixer.c	2006-03-07 20:18:15.000000000 +0100
+++ gst-plugins-base-0.10.5/ext/alsa/gstalsamixer.c	2006-05-05 16:53:53.000000000 +0200
@@ -133,22 +133,17 @@
   count = snd_mixer_get_count (mixer->handle);
   element = snd_mixer_first_elem (mixer->handle);
 
-  /* build track list */
+  /* build track list
+    
+     Some ALSA tracks may have playback and capture capabilities. Here we model 
+     them as two seperate GStreamer tracks.
+  */
+  
   for (i = 0; i < count; i++) {
     GList *item;
-    gint channels = 0, samename = 0;
-    gint flags = GST_MIXER_TRACK_OUTPUT;
+    gint samename = 0;
     gboolean got_it = FALSE;
 
-    if (snd_mixer_selem_has_capture_switch (element)) {
-      if (!(mixer->dir & GST_ALSA_MIXER_CAPTURE))
-        goto next;
-      flags = GST_MIXER_TRACK_INPUT;
-    } else {
-      if (!(mixer->dir & GST_ALSA_MIXER_PLAYBACK))
-        goto next;
-    }
-
     /* prevent dup names */
     for (item = mixer->tracklist; item != NULL; item = item->next) {
       snd_mixer_elem_t *temp;
@@ -163,49 +158,64 @@
         samename++;
     }
 
-    if (snd_mixer_selem_has_capture_volume (element)) {
-      while (snd_mixer_selem_has_capture_channel (element, channels))
+    if (mixer->dir & GST_ALSA_MIXER_PLAYBACK &&
+        snd_mixer_selem_has_playback_volume (element))
+    {
+      gint flags = GST_MIXER_TRACK_OUTPUT;  
+      gint channels = 0;
+      
+      while (channels < GST_ALSA_MAX_CHANNELS &&
+             snd_mixer_selem_has_playback_channel (element, channels))
+      {
         channels++;
+      }
+      
+      if (first) {
+        first = FALSE;
+        flags |= GST_MIXER_TRACK_MASTER;
+      }
       track = gst_alsa_mixer_track_new (element, samename,
-          i, channels, flags, GST_ALSA_MIXER_TRACK_CAPTURE);
+          i, channels, flags, GST_ALSA_MIXER_TRACK_PLAYBACK, FALSE);
       mixer->tracklist = g_list_append (mixer->tracklist, track);
       got_it = TRUE;
-
-      /* there might be another volume slider; make that playback */
-      flags &= ~GST_MIXER_TRACK_INPUT;
-      flags |= GST_MIXER_TRACK_OUTPUT;
     }
 
-    if (snd_mixer_selem_has_playback_volume (element)) {
-      while (snd_mixer_selem_has_playback_channel (element, channels))
+    if (mixer->dir & GST_ALSA_MIXER_CAPTURE &&
+        snd_mixer_selem_has_capture_volume (element))
+    {
+      gint channels = 0;
+        
+      while (channels < GST_ALSA_MAX_CHANNELS &&
+             snd_mixer_selem_has_capture_channel (element, channels))
+      {
         channels++;
-      if (first) {
-        first = FALSE;
-        flags |= GST_MIXER_TRACK_MASTER;
       }
+
       track = gst_alsa_mixer_track_new (element, samename,
-          i, channels, flags, GST_ALSA_MIXER_TRACK_PLAYBACK);
+          i, channels, GST_MIXER_TRACK_INPUT, GST_ALSA_MIXER_TRACK_CAPTURE,
+          got_it);
       mixer->tracklist = g_list_append (mixer->tracklist, track);
       got_it = TRUE;
     }
 
-    if (snd_mixer_selem_is_enumerated (element)) {
-      opts = gst_alsa_mixer_options_new (element, i);
-      mixer->tracklist = g_list_append (mixer->tracklist, opts);
-      got_it = TRUE;
-    }
 
-    if (!got_it) {
-      if (flags == GST_MIXER_TRACK_OUTPUT &&
-          snd_mixer_selem_has_playback_switch (element)) {
-        /* simple mute switch */
-        track = gst_alsa_mixer_track_new (element, samename,
-            i, 0, flags, GST_ALSA_MIXER_TRACK_PLAYBACK);
-        mixer->tracklist = g_list_append (mixer->tracklist, track);
+    if (mixer->dir & GST_ALSA_MIXER_PLAYBACK) {
+      if (snd_mixer_selem_is_enumerated (element)) {
+        opts = gst_alsa_mixer_options_new (element, i);
+        mixer->tracklist = g_list_append (mixer->tracklist, opts);
+        got_it = TRUE;
+      }
+
+      if (!got_it) {
+        if (snd_mixer_selem_has_playback_switch (element)) {
+          /* simple mute switch */
+          track = gst_alsa_mixer_track_new (element, samename,
+              i, 0, GST_MIXER_TRACK_OUTPUT, GST_ALSA_MIXER_TRACK_PLAYBACK, FALSE);
+          mixer->tracklist = g_list_append (mixer->tracklist, track);
+        }
       }
     }
 
-  next:
     element = snd_mixer_elem_next (element);
   }
 }
@@ -294,7 +304,10 @@
     else
       track->flags |= GST_MIXER_TRACK_MUTE;
   }
-  if (alsa_track->alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) {
+  
+  if ((alsa_track->alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) &&
+      (snd_mixer_selem_has_capture_switch (alsa_track->element)))
+  {
     snd_mixer_selem_get_capture_switch (alsa_track->element, 0, &v);
     if (!v)
       track->flags &= ~GST_MIXER_TRACK_RECORD;
@@ -403,13 +416,15 @@
 
   gst_alsa_mixer_update (mixer, alsa_track);
 
-  if (record) {
-    track->flags |= GST_MIXER_TRACK_RECORD;
-  } else {
-    track->flags &= ~GST_MIXER_TRACK_RECORD;
-  }
+  if (snd_mixer_selem_has_capture_switch (alsa_track->element)) {
+    if (record) {
+        track->flags |= GST_MIXER_TRACK_RECORD;
+    } else {
+        track->flags &= ~GST_MIXER_TRACK_RECORD;
+    }
 
-  snd_mixer_selem_set_capture_switch_all (alsa_track->element, record ? 1 : 0);
+    snd_mixer_selem_set_capture_switch_all (alsa_track->element, record ? 1 : 0);
+  }
 }
 
 void
diff -urN gst-plugins-base-0.10.5.org/ext/alsa/gstalsamixertrack.c gst-plugins-base-0.10.5/ext/alsa/gstalsamixertrack.c
--- gst-plugins-base-0.10.5.org/ext/alsa/gstalsamixertrack.c	2004-10-25 17:58:35.000000000 +0200
+++ gst-plugins-base-0.10.5/ext/alsa/gstalsamixertrack.c	2006-05-05 16:52:07.000000000 +0200
@@ -71,15 +71,17 @@
 
 GstMixerTrack *
 gst_alsa_mixer_track_new (snd_mixer_elem_t * element,
-    gint num, gint track_num, gint channels, gint flags, gint alsa_flags)
+    gint num, gint track_num, gint channels, gint flags, gint alsa_flags,
+    gboolean append_capture)
 {
-  gint i;
+  int i;
   long min = 0, max = 0;
   struct
   {
-    gchar *orig, *trans;
+    gchar* orig; gchar* trans;
   } alsa_track_labels[] = {
     {
+    "Capture", _("Capture")}, {
     "Master", _("Master")}, {
     "Bass", _("Bass")}, {
     "Treble", _("Treble")}, {
@@ -90,33 +92,32 @@
     "Mic", _("Microphone")}, {
     "PC Speaker", _("PC Speaker")}, {
     "Playback", _("Playback")}, {
-    "Capture", _("Capture")}, {
     NULL, NULL}
   };
 
   GstMixerTrack *track = g_object_new (GST_ALSA_MIXER_TRACK_TYPE, NULL);
   GstAlsaMixerTrack *alsa_track = (GstAlsaMixerTrack *) track;
 
-  /* set basic information */
-  if (num == 0)
-    track->label = g_strdup (snd_mixer_selem_get_name (element));
-  else
-    track->label = g_strdup_printf ("%s %d",
-        snd_mixer_selem_get_name (element), num + 1);
-  i = 0;
-  while (alsa_track_labels[i].orig != NULL) {
-    if (!g_utf8_collate (snd_mixer_selem_get_name (element),
-            alsa_track_labels[i].orig)) {
-      g_free (track->label);
-      if (num == 0)
-        track->label = g_strdup (alsa_track_labels[i].trans);
-      else
-        track->label = g_strdup_printf ("%s %d",
-            alsa_track_labels[i].trans, num);
+  const gchar* label = snd_mixer_selem_get_name (element);
+  
+  for (i = 0; alsa_track_labels[i].orig != NULL; ++i) {
+    if (!g_utf8_collate (label, alsa_track_labels[i].orig)) {
+      label = alsa_track_labels[i].trans;
       break;
     }
-    i++;
   }
+
+  if (num == 0) {
+    track->label = g_strdup_printf ("%s%s%s", label,
+                                    append_capture ? " " : "",
+                                    append_capture ? alsa_track_labels[0].trans : "");
+  } else {
+    track->label = g_strdup_printf ("%s%s%s %d", label,
+                                    append_capture ? " " : "",
+                                    append_capture ? alsa_track_labels[0].trans : "",
+                                    num);
+  }
+  
   track->num_channels = channels;
   track->flags = flags;
   alsa_track->element = element;
@@ -154,11 +155,16 @@
   }
 
   if (flags & GST_MIXER_TRACK_INPUT) {
-    int val = 0;
-
-    snd_mixer_selem_get_capture_switch (element, 0, &val);
-    if (val)
-      track->flags |= GST_MIXER_TRACK_RECORD;
+      
+    if (snd_mixer_selem_has_capture_switch (element)) {
+        int val = 0;
+
+        snd_mixer_selem_get_capture_switch (element, 0, &val);
+        if (val)
+            track->flags |= GST_MIXER_TRACK_RECORD;
+    } else {
+        track->flags |= GST_MIXER_TRACK_RECORD;
+    }
   }
 
   return track;
diff -urN gst-plugins-base-0.10.5.org/ext/alsa/gstalsamixertrack.h gst-plugins-base-0.10.5/ext/alsa/gstalsamixertrack.h
--- gst-plugins-base-0.10.5.org/ext/alsa/gstalsamixertrack.h	2005-12-06 20:41:55.000000000 +0100
+++ gst-plugins-base-0.10.5/ext/alsa/gstalsamixertrack.h	2006-05-05 16:14:49.000000000 +0200
@@ -60,7 +60,8 @@
                                                  gint                   track_num,
                                                  gint                   channels,
                                                  gint                   flags,
-                                                 gint                   alsa_flags);
+                                                 gint                   alsa_flags,
+                                                 gboolean               append_capture);
 
 
 G_END_DECLS
