Updated Oriya Translation

[empathy.git] / libempathy-gtk / empathy-audio-sink.c

diff --git a/libempathy-gtk/empathy-audio-sink.c b/libempathy-gtk/empathy-audio-sink.c
index d304a26769435afef6ad20d01d053f1345536f64..1d2169593f73739dad371b861164a48239a6f575 100644 (file)
--- a/libempathy-gtk/empathy-audio-sink.c
+++ b/libempathy-gtk/empathy-audio-sink.c
@@ -64,9 +64,19 @@ empathy_audio_sink_element_added_cb (FsElementAddedNotifier *notifier,
 {
   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,12 +92,14 @@ empathy_audio_sink_init (EmpathyGstAudioSink *obj)
     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));
 
-
   gst_bin_add_many (GST_BIN (obj), resample, priv->volume, priv->sink, NULL);
   gst_element_link_many (resample, priv->volume, priv->sink, NULL);
 
@@ -132,8 +144,6 @@ empathy_audio_sink_get_property (GObject *object,
     }
 }
 
-
-
 static void
 empathy_audio_sink_class_init (EmpathyGstAudioSinkClass
   *empathy_audio_sink_class)
@@ -150,7 +160,7 @@ empathy_audio_sink_class_init (EmpathyGstAudioSinkClass
   object_class->set_property = empathy_audio_sink_set_property;
   object_class->get_property = empathy_audio_sink_get_property;
 
-  param_spec = g_param_spec_double ("volume", "Volume", "volume factory",
+  param_spec = g_param_spec_double ("volume", "Volume", "volume control",
     0.0, 5.0, 1.0,
     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_VOLUME, param_spec);
@@ -171,6 +181,9 @@ empathy_audio_sink_dispose (GObject *object)
     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);
@@ -191,7 +204,15 @@ empathy_audio_sink_finalize (GObject *object)
 GstElement *
 empathy_audio_sink_new (void)
 {
-  return GST_ELEMENT (g_object_new (EMPATHY_TYPE_GST_AUDIO_SINK, NULL));
+  static gboolean registered = FALSE;
+
+  if (!registered) {
+    if (!gst_element_register (NULL, "empathyaudiosink",
+            GST_RANK_NONE, EMPATHY_TYPE_GST_AUDIO_SINK))
+      return NULL;
+    registered = TRUE;
+  }
+  return gst_element_factory_make ("empathyaudiosink", NULL);
 }
 
 void