diff options
author | Jan Schmidt <thaytan@mad.scientist.com> | 2006-02-05 22:22:56 +0000 |
---|---|---|
committer | Jan Schmidt <thaytan@mad.scientist.com> | 2006-02-05 22:22:56 +0000 |
commit | 059527abc02d074cb31af6d0b25e0ed1c8b032c9 (patch) | |
tree | be1db2d7c22090c9451cc2be72182ebd423b84bd /ext/gconf/gstgconfvideosrc.c | |
parent | 07c1dceae064b547747a1513ca17225c1c1c3e0e (diff) |
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)
Diffstat (limited to 'ext/gconf/gstgconfvideosrc.c')
-rw-r--r-- | ext/gconf/gstgconfvideosrc.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/ext/gconf/gstgconfvideosrc.c b/ext/gconf/gstgconfvideosrc.c index ecc3cc27..8fb75376 100644 --- a/ext/gconf/gstgconfvideosrc.c +++ b/ext/gconf/gstgconfvideosrc.c @@ -22,6 +22,8 @@ #include "config.h" #endif +#include <string.h> + #include "gstgconfelements.h" #include "gstgconfvideosrc.h" @@ -84,6 +86,9 @@ gst_gconf_video_src_reset (GstGConfVideoSrc * src) targetpad = gst_element_get_pad (src->kid, "src"); gst_ghost_pad_set_target (GST_GHOST_PAD (src->pad), targetpad); gst_object_unref (targetpad); + + g_free (src->gconf_str); + src->gconf_str = NULL; } static void @@ -98,7 +103,8 @@ gst_gconf_video_src_init (GstGConfVideoSrc * src, src->client = gconf_client_get_default (); gconf_client_add_dir (src->client, GST_GCONF_DIR, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL); - gconf_client_notify_add (src->client, GST_GCONF_DIR "/default/videosrc", + gconf_client_notify_add (src->client, + GST_GCONF_DIR "/" GST_GCONF_VIDEOSRC_KEY, cb_toggle_element, src, NULL, NULL); } @@ -112,6 +118,9 @@ gst_gconf_video_src_dispose (GObject * object) src->client = NULL; } + g_free (src->gconf_str); + src->gconf_str = NULL; + GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object)); } @@ -119,6 +128,19 @@ static gboolean do_toggle_element (GstGConfVideoSrc * src) { GstPad *targetpad; + gchar *new_gconf_str; + + new_gconf_str = gst_gconf_get_string (GST_GCONF_AUDIOSRC_KEY); + if (new_gconf_str != NULL && src->gconf_str != NULL && + (strlen (new_gconf_str) == 0 || + strcmp (src->gconf_str, new_gconf_str) == 0)) { + g_free (new_gconf_str); + GST_DEBUG_OBJECT (src, "GConf key was updated, but it didn't change"); + return TRUE; + } + + g_free (src->gconf_str); + src->gconf_str = new_gconf_str; /* kill old element */ if (src->kid) { @@ -132,6 +154,8 @@ do_toggle_element (GstGConfVideoSrc * src) if (!(src->kid = gst_gconf_get_default_video_src ())) { GST_ELEMENT_ERROR (src, LIBRARY, SETTINGS, (NULL), ("Failed to render video source from GConf")); + g_free (src->gconf_str); + src->gconf_str = NULL; return FALSE; } gst_element_set_state (src->kid, GST_STATE (src)); |