ext/gconf/: Ignore changing the GConf key to "". Ignore GConf key updates that don't actually change the string.

Original commit message from CVS:
* ext/gconf/gconf.c: (gst_gconf_get_default_audio_sink),
(gst_gconf_get_default_video_sink),
(gst_gconf_get_default_audio_src),
(gst_gconf_get_default_video_src):
* ext/gconf/gconf.h:
* ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_reset),
(gst_gconf_audio_sink_init), (gst_gconf_audio_sink_dispose),
(do_toggle_element):
* ext/gconf/gstgconfaudiosink.h:
* ext/gconf/gstgconfaudiosrc.c: (gst_gconf_audio_src_reset),
(gst_gconf_audio_src_init), (gst_gconf_audio_src_dispose),
(do_toggle_element):
* ext/gconf/gstgconfaudiosrc.h:
* ext/gconf/gstgconfvideosink.c: (gst_gconf_video_sink_reset),
(gst_gconf_video_sink_init), (gst_gconf_video_sink_dispose),
(do_toggle_element):
* ext/gconf/gstgconfvideosink.h:
* ext/gconf/gstgconfvideosrc.c: (gst_gconf_video_src_reset),
(gst_gconf_video_src_init), (gst_gconf_video_src_dispose),
(do_toggle_element):
* ext/gconf/gstgconfvideosrc.h:
Ignore changing the GConf key to "". Ignore GConf key updates
that don't actually change the string.
For now, ignore the GConf key when the state is > READY, as
it breaks streaming. Sometime it will be nice to bring the
new sink online even mid-stream, by sending NEWSEGMENT info
and possibly prerolling.
(Fixes #326736)

1 files changed, 43 insertions, 1 deletions

diff --git a/ext/gconf/gstgconfaudiosink.c b/ext/gconf/gstgconfaudiosink.c
index ec80384b..5e409519 100644
--- a/ext/gconf/gstgconfaudiosink.c
+++ b/ext/gconf/gstgconfaudiosink.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstgconfelements.h"
 #include "gstgconfaudiosink.h"
 
@@ -83,6 +85,9 @@ gst_gconf_audio_sink_reset (GstGConfAudioSink * sink)
   targetpad = gst_element_get_pad (sink->kid, "sink");
   gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad);
   gst_object_unref (targetpad);
+
+  g_free (sink->gconf_str);
+  sink->gconf_str = NULL;
 }
 
 static void
@@ -97,7 +102,8 @@ gst_gconf_audio_sink_init (GstGConfAudioSink * sink,
   sink->client = gconf_client_get_default ();
   gconf_client_add_dir (sink->client, GST_GCONF_DIR,
       GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
-  gconf_client_notify_add (sink->client, GST_GCONF_DIR "/default/audiosink",
+  gconf_client_notify_add (sink->client,
+      GST_GCONF_DIR "/" GST_GCONF_AUDIOSINK_KEY,
       cb_toggle_element, sink, NULL, NULL);
 }
 
@@ -111,6 +117,9 @@ gst_gconf_audio_sink_dispose (GObject * object)
     sink->client = NULL;
   }
 
+  g_free (sink->gconf_str);
+  sink->gconf_str = NULL;
+
   GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
 }
 
@@ -118,6 +127,37 @@ static gboolean
 do_toggle_element (GstGConfAudioSink * sink)
 {
   GstPad *targetpad;
+  gchar *new_gconf_str;
+  GstState cur, next;
+
+  new_gconf_str = gst_gconf_get_string (GST_GCONF_AUDIOSINK_KEY);
+  if (new_gconf_str != NULL && sink->gconf_str != NULL &&
+      (strlen (new_gconf_str) == 0 ||
+          strcmp (sink->gconf_str, new_gconf_str) == 0)) {
+    g_free (new_gconf_str);
+    GST_DEBUG_OBJECT (sink, "GConf key was updated, but it didn't change");
+    return TRUE;
+  }
+
+  /* Sometime, it would be lovely to allow sink changes even when
+   * already running, but this involves sending an appropriate new-segment
+   * and possibly prerolling etc */
+  GST_OBJECT_LOCK (sink);
+  cur = GST_STATE (sink);
+  next = GST_STATE_PENDING (sink);
+  GST_OBJECT_UNLOCK (sink);
+
+  if (cur > GST_STATE_READY || next == GST_STATE_PAUSED) {
+    GST_DEBUG_OBJECT (sink,
+        "Auto-sink is already running. Ignoring GConf change");
+    return TRUE;
+  }
+
+  GST_DEBUG_OBJECT (sink, "GConf key changed: '%s' to '%s'",
+      GST_STR_NULL (sink->gconf_str), GST_STR_NULL (new_gconf_str));
+
+  g_free (sink->gconf_str);
+  sink->gconf_str = new_gconf_str;
 
   /* kill old element */
   if (sink->kid) {
@@ -131,6 +171,8 @@ do_toggle_element (GstGConfAudioSink * sink)
   if (!(sink->kid = gst_gconf_get_default_audio_sink ())) {
     GST_ELEMENT_ERROR (sink, LIBRARY, SETTINGS, (NULL),
         ("Failed to render audio sink from GConf"));
+    g_free (sink->gconf_str);
+    sink->gconf_str = NULL;
     return FALSE;
   }
   gst_element_set_state (sink->kid, GST_STATE (sink));