gnome-media r4318 - in trunk: . gst-mixer/src

[bcameron svn gnome org]

Author: bcameron
Date: Mon Mar 30 18:50:01 2009
New Revision: 4318
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4318&view=rev

Log:
2009-03-30  Brian Cameron  <brian cameron sun com>

        * gst-mixer/src/element.c, gst-mixer/src/preferences.c:
          Initialize the whitelist before using it.


Modified:
   trunk/ChangeLog
   trunk/gst-mixer/src/element.c
   trunk/gst-mixer/src/preferences.c

Modified: trunk/gst-mixer/src/element.c
==============================================================================
--- trunk/gst-mixer/src/element.c	(original)
+++ trunk/gst-mixer/src/element.c	Mon Mar 30 18:50:01 2009
@@ -133,6 +133,14 @@
     { "front", FALSE },
     { NULL, FALSE }
   };
+    
+  /* Reset the whitelist.  This is a hack to fix bugs LP:345645, 576022 */
+  if (track == NULL)
+  {
+    for (i = 0; list[i].label != NULL; i++)
+      list[i].done = FALSE;
+    return TRUE;
+  }
 
   for (i = 0; !found && list[i].label != NULL; i++) {
     gchar *label_l = NULL;
@@ -304,6 +312,7 @@
   }
 
   /* show */
+  gnome_volume_control_element_whitelist (NULL);
   for (item = gst_mixer_list_tracks (el->mixer);
        item != NULL; item = item->next) {
     GstMixerTrack *track = item->data;

Modified: trunk/gst-mixer/src/preferences.c
==============================================================================
--- trunk/gst-mixer/src/preferences.c	(original)
+++ trunk/gst-mixer/src/preferences.c	Mon Mar 30 18:50:01 2009
@@ -309,6 +309,7 @@
   gst_object_replace ((GstObject **) &prefs->mixer, GST_OBJECT (element));
 
   /* add all tracks */
+  gnome_volume_control_element_whitelist (NULL);
   for (item = gst_mixer_list_tracks (mixer);
        item != NULL; item = item->next) {
     GstMixerTrack *track = item->data;