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

[malureau svn gnome org]

Author: malureau
Date: Mon Jun  2 19:49:03 2008
New Revision: 3876
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3876&view=rev

Log:
2008-06-02  Marc-Andrà Lureau  <marcandre lureau gmail com>

	* gst-mixer/src/track.c (gnome_volume_control_track_update):
	* gst-mixer/src/volume.c (gnome_volume_control_volume_update):
	Stop muting the track when volume is zero, and doing weird things
	that do more harm than good.
	(Closes #341021)


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

Modified: trunk/gst-mixer/src/track.c
==============================================================================
--- trunk/gst-mixer/src/track.c	(original)
+++ trunk/gst-mixer/src/track.c	Mon Jun  2 19:49:03 2008
@@ -137,13 +137,14 @@
 				GST_MIXER_TRACK_RECORD) ? TRUE : FALSE;
 
   if (trkw->sliderbox) {
-    gnome_volume_control_volume_update (trkw->sliderbox);
+    gnome_volume_control_volume_update (GNOME_VOLUME_CONTROL_VOLUME (trkw->sliderbox));
     gnome_volume_control_volume_ask (
       GNOME_VOLUME_CONTROL_VOLUME (trkw->sliderbox),
       &vol_is_zero, &slider_is_zero);
   }
+
   if (!slider_is_zero && vol_is_zero)
-    mute = TRUE;
+    mute |= TRUE;
 
   if (trkw->mute) {
     if (gnome_volume_control_button_get_active (trkw->mute) == mute) {

Modified: trunk/gst-mixer/src/volume.c
==============================================================================
--- trunk/gst-mixer/src/volume.c	(original)
+++ trunk/gst-mixer/src/volume.c	Mon Jun  2 19:49:03 2008
@@ -506,7 +506,6 @@
 gnome_volume_control_volume_update (GnomeVolumeControlVolume *vol)
 {
   gint *volumes, n;
-  gboolean real_zero, slider_zero;
   GList *scales;
 
   /* don't do callbacks */
@@ -517,13 +516,6 @@
 
   volumes = g_new (gint, vol->track->num_channels);
   gst_mixer_get_volume (vol->mixer, vol->track, volumes);
-  gnome_volume_control_volume_ask (vol, &real_zero, &slider_zero);
-  if (real_zero || GST_MIXER_TRACK_HAS_FLAG (vol->track,
-					     GST_MIXER_TRACK_MUTE)) {
-    g_free (volumes);
-    vol->locked = FALSE;
-    return;
-  }
 
   /* did we change? */
   for (n = 0, scales = vol->scales;