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

[bcameron svn gnome org]

Author: bcameron
Date: Mon Jun 16 18:56:36 2008
New Revision: 3885
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3885&view=rev

Log:
2008-06-16  Brian Cameron  <brian cameron sun com>

        * volume.[ch], track.c: Remove call to gnome_volume_control_volume_sync
          in cb_mute_toggled.  This causes problems for the SunAudio mixer.  It
          is better for the mixer plugin itself to update state as needed.
          Also remove the gnome_volume_control_volume_sync function itself
          since nothing more calls it.  Fixes bug #537028.


Modified:
   trunk/ChangeLog
   trunk/gst-mixer/src/track.c
   trunk/gst-mixer/src/volume.c
   trunk/gst-mixer/src/volume.h

Modified: trunk/gst-mixer/src/track.c
==============================================================================
--- trunk/gst-mixer/src/track.c	(original)
+++ trunk/gst-mixer/src/track.c	Mon Jun 16 18:56:36 2008
@@ -23,6 +23,8 @@
 #include "config.h"
 #endif
 
+#include <unistd.h>
+#include <stropts.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
@@ -61,7 +63,6 @@
 
   gst_mixer_set_mute (ctrl->mixer, ctrl->track,
 		      !gnome_volume_control_button_get_active (button));
-  gnome_volume_control_volume_sync (GNOME_VOLUME_CONTROL_VOLUME (ctrl->sliderbox));
 }
 
 static void

Modified: trunk/gst-mixer/src/volume.c
==============================================================================
--- trunk/gst-mixer/src/volume.c	(original)
+++ trunk/gst-mixer/src/volume.c	Mon Jun 16 18:56:36 2008
@@ -432,16 +432,6 @@
   vol->locked = FALSE;
 }
 
-/*
- * To be called after unmuting.
- */
-
-void
-gnome_volume_control_volume_sync (GnomeVolumeControlVolume * vol)
-{
-  cb_volume_changed (gtk_range_get_adjustment (vol->scales->data), vol);
-}
-
 static void
 cb_lock_toggled (GtkToggleButton *button,
 		 gpointer         data)

Modified: trunk/gst-mixer/src/volume.h
==============================================================================
--- trunk/gst-mixer/src/volume.h	(original)
+++ trunk/gst-mixer/src/volume.h	Mon Jun 16 18:56:36 2008
@@ -72,7 +72,6 @@
 GtkWidget *	gnome_volume_control_volume_new	(GstMixer *mixer,
 						 GstMixerTrack *track,
 						 gint      padding);
-void		gnome_volume_control_volume_sync (GnomeVolumeControlVolume *volume);
 void		gnome_volume_control_volume_ask (GnomeVolumeControlVolume *volume,
 						 gboolean * real_zero,
 						 gboolean * slider_zero);