Re-factor the gconfaudiosink into a "GstSwitchSink" base class and a child that implements the GConf key monitoring. ...

Original commit message from CVS:
* ext/gconf/Makefile.am:
* ext/gconf/gconf.c: (gst_gconf_get_string),
(gst_gconf_get_key_for_sink_profile), (gst_gconf_set_string),
(gst_gconf_render_bin_with_default):
* ext/gconf/gconf.h:
* ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_base_init),
(gst_gconf_audio_sink_reset), (gst_gconf_audio_sink_init),
(gst_gconf_audio_sink_dispose), (do_change_child),
(gst_gconf_switch_profile), (gst_gconf_audio_sink_set_property),
(cb_change_child), (gst_gconf_audio_sink_change_state):
* ext/gconf/gstgconfaudiosink.h:
* ext/gconf/gstswitchsink.c: (gst_switch_sink_base_init),
(gst_switch_sink_class_init), (gst_switch_sink_reset),
(gst_switch_sink_init), (gst_switch_sink_dispose),
(gst_switch_commit_new_kid), (gst_switch_sink_set_child),
(gst_switch_sink_set_property), (gst_switch_sink_handle_event),
(gst_switch_sink_get_property), (gst_switch_sink_change_state):
* ext/gconf/gstswitchsink.h:
* gst/autodetect/gstautoaudiosink.c:
(gst_auto_audio_sink_class_init), (gst_auto_audio_sink_dispose),
(gst_auto_audio_sink_clear_kid), (gst_auto_audio_sink_reset),
(gst_auto_audio_sink_detect):
* gst/autodetect/gstautovideosink.c:
(gst_auto_video_sink_class_init), (gst_auto_video_sink_dispose),
(gst_auto_video_sink_clear_kid), (gst_auto_video_sink_reset),
(gst_auto_video_sink_detect):
Re-factor the gconfaudiosink into a "GstSwitchSink" base class
and a child that implements the GConf key monitoring. The end goal of
this is an audio sink that can be changed on the fly, but at the
moment it still only changes on the next READY transition.

1 files changed, 4 insertions, 5 deletions

diff --git a/ext/gconf/gstgconfaudiosink.h b/ext/gconf/gstgconfaudiosink.h
index 02a397da..c323b131 100644
--- a/ext/gconf/gstgconfaudiosink.h
+++ b/ext/gconf/gstgconfaudiosink.h
@@ -22,6 +22,7 @@
 
 #include <gst/gst.h>
 #include <gconf/gconf-client.h>
+#include "gstswitchsink.h"
 
 G_BEGIN_DECLS
 
@@ -39,21 +40,19 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GCONF_AUDIO_SINK))
 
 typedef struct _GstGConfAudioSink {
-  GstBin parent;
+  GstSwitchSink parent;
 
   /* explicit pointers to stuff used */
   GConfClient *client;
-  int profile;
+  GstGConfProfile profile;
   guint connection;
-  GstElement *kid;
-  GstPad *pad;
 
   /* Current gconf string */
   gchar *gconf_str;
 } GstGConfAudioSink;
 
 typedef struct _GstGConfAudioSinkClass {
-  GstBinClass parent_class;
+  GstSwitchSinkClass parent_class;
 } GstGConfAudioSinkClass;
 
 GType   gst_gconf_audio_sink_get_type   (void);