empathy r2492 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Feb 16 21:25:31 2009
New Revision: 2492
URL: http://svn.gnome.org/viewvc/empathy?rev=2492&view=rev

Log:
When finding a better element to use for volume, reset the current one and transfer the volume changes to the new one

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/libempathy-gtk/empathy-audio-sink.c

Modified: trunk/libempathy-gtk/empathy-audio-sink.c
==============================================================================
--- trunk/libempathy-gtk/empathy-audio-sink.c	(original)
+++ trunk/libempathy-gtk/empathy-audio-sink.c	Mon Feb 16 21:25:31 2009
@@ -64,9 +64,19 @@
 {
   EmpathyGstAudioSinkPrivate *priv = EMPATHY_GST_AUDIO_SINK_GET_PRIVATE (self);
 
-  if (g_object_class_find_property (G_OBJECT_CLASS (element), "volume"))
+  if (g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume"))
     {
-      priv->volume = element;
+      gdouble volume;
+
+      volume = empathy_audio_sink_get_volume (self);
+      empathy_audio_sink_set_volume (self, 1.0);
+
+      if (priv->volume != NULL)
+        g_object_unref (priv->volume);
+      priv->volume = g_object_ref (element);
+
+      if (volume != 1.0)
+        empathy_audio_sink_set_volume (self, volume);
     }
 }
 
@@ -82,7 +92,10 @@
     G_CALLBACK (empathy_audio_sink_element_added_cb), obj);
 
   resample = gst_element_factory_make ("audioresample", NULL);
+
   priv->volume = gst_element_factory_make ("volume", NULL);
+  g_object_ref (priv->volume);
+
   priv->sink = gst_element_factory_make ("gconfaudiosink", NULL);
 
   fs_element_added_notifier_add (priv->notifier, GST_BIN (priv->sink));
@@ -171,6 +184,9 @@
     g_object_unref (priv->notifier);
   priv->notifier = NULL;
 
+  if (priv->volume != NULL)
+    g_object_unref (priv->volume);
+  priv->volume = NULL;
 
   if (G_OBJECT_CLASS (empathy_audio_sink_parent_class)->dispose)
     G_OBJECT_CLASS (empathy_audio_sink_parent_class)->dispose (object);