summaryrefslogtreecommitdiffstats
path: root/ext/gconf
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-02-14 17:01:25 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-02-14 17:01:25 +0000
commit3b5868a9e006caf45c84068462dc333bca9dcf12 (patch)
tree30d2a4708507bb36f28eb9a4dcbd453ac299320f /ext/gconf
parent6021b924655550c1b8f185920452c64665a04cf4 (diff)
ext/gconf/gstgconfaudiosink.c: Don't reset the profile when going switching states, as it makes the element non-reusa...
Original commit message from CVS: * ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_reset), (do_change_child): Don't reset the profile when going switching states, as it makes the element non-reusable.
Diffstat (limited to 'ext/gconf')
-rw-r--r--ext/gconf/gstgconfaudiosink.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/gconf/gstgconfaudiosink.c b/ext/gconf/gstgconfaudiosink.c
index 25b06e32..3ac1b897 100644
--- a/ext/gconf/gstgconfaudiosink.c
+++ b/ext/gconf/gstgconfaudiosink.c
@@ -105,8 +105,6 @@ gst_gconf_audio_sink_reset (GstGConfAudioSink * sink)
g_free (sink->gconf_str);
sink->gconf_str = NULL;
-
- gst_gconf_switch_profile (sink, GCONF_PROFILE_NONE);
}
static void
@@ -146,6 +144,9 @@ do_change_child (GstGConfAudioSink * sink)
gchar *new_gconf_str;
GstElement *new_kid;
+ if (sink->profile == GCONF_PROFILE_NONE)
+ return FALSE; /* Can't switch to a 'NONE' sink */
+
key = gst_gconf_get_key_for_sink_profile (sink->profile);
new_gconf_str = gst_gconf_get_string (key);