diff -r 9b2c3c7a1a9c -r 567bb019e3e3 gst_plugins_base/gst/playback/gstplaysink.h
--- a/gst_plugins_base/gst/playback/gstplaysink.h	Wed Mar 31 22:03:18 2010 +0300
+++ b/gst_plugins_base/gst/playback/gstplaysink.h	Tue Aug 31 15:30:33 2010 +0300
@@ -36,6 +36,8 @@
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAY_SINK))
 #define GST_IS_PLAY_SINK_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAY_SINK))
+#define GST_PLAY_SINK_CAST(obj) \
+  ((GstPlaySink*)(obj))
 
 /**
  * GstPlaySinkType:
@@ -44,7 +46,9 @@
  * @GST_PLAY_SINK_TYPE_VIDEO: a non-raw video pad
  * @GST_PLAY_SINK_TYPE_VIDEO_RAW: a raw video pad
  * @GST_PLAY_SINK_TYPE_TEXT: a raw text pad
+ * @GST_PLAY_SINK_TYPE_SUBPIC: a subpicture pad
  * @GST_PLAY_SINK_TYPE_LAST: the last type
+ * @GST_PLAY_SINK_TYPE_FLUSHING: a flushing pad, used when shutting down
  *
  * Types of pads that can be requested from the sinks.
  */
@@ -54,7 +58,11 @@
   GST_PLAY_SINK_TYPE_VIDEO     = 2,
   GST_PLAY_SINK_TYPE_VIDEO_RAW = 3,
   GST_PLAY_SINK_TYPE_TEXT      = 4,
-  GST_PLAY_SINK_TYPE_LAST      = 5
+  GST_PLAY_SINK_TYPE_SUBPIC    = 5,
+  GST_PLAY_SINK_TYPE_LAST      = 6,
+
+  /* this is a dummy pad */
+  GST_PLAY_SINK_TYPE_FLUSHING  = 7
 } GstPlaySinkType;
 
 typedef struct _GstPlaySink GstPlaySink;
@@ -80,18 +88,23 @@
 IMPORT_C
 #endif
 
+void             gst_play_sink_set_sink       (GstPlaySink * playsink, GstPlaySinkType type, GstElement * sink);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
+GstElement *     gst_play_sink_get_sink       (GstPlaySink * playsink, GstPlaySinkType type);
 
-void             gst_play_sink_set_video_sink (GstPlaySink * playsink, GstElement * sink);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
-void             gst_play_sink_set_audio_sink (GstPlaySink * playsink, GstElement * sink);
+
+void             gst_play_sink_set_vis_plugin (GstPlaySink * playsink, GstElement * vis);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
 
-void             gst_play_sink_set_vis_plugin (GstPlaySink * playsink, GstElement * vis);
+GstElement *     gst_play_sink_get_vis_plugin (GstPlaySink * playsink);
 #ifdef __SYMBIAN32__
 IMPORT_C
 #endif
@@ -130,6 +143,17 @@
 #endif
 
 
+void             gst_play_sink_set_font_desc  (GstPlaySink *playsink, const gchar * desc);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
+
+gchar *          gst_play_sink_get_font_desc  (GstPlaySink *playsink);
+#ifdef __SYMBIAN32__
+IMPORT_C
+#endif
+
+
 GstBuffer *      gst_play_sink_get_last_frame (GstPlaySink * playsink);
 #ifdef __SYMBIAN32__
 IMPORT_C