summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-06-03 12:45:08 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2009-06-03 12:45:08 +0200
commit49ee8a2d056ad4dcf336a9fa6d3d4db575c99b0a (patch)
tree67a469d7fcf844866b885d356152156bf3a0e5be
parent59d9833924b096c117ab3133d9c036bcc974e439 (diff)
playbin2: also set custom text and subp sinks
Set the custom subpicture and text sinks along with the custom audio and video sinks when needed. Fix a little docs blurb too.
-rw-r--r--gst/playback/gstplaybin2.c4
-rw-r--r--gst/playback/gstplaysink.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 77916bed8..9476299f3 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -2108,6 +2108,10 @@ no_more_pads_cb (GstElement * decodebin, GstSourceGroup * group)
gst_play_sink_set_sink (playbin->playsink, GST_PLAY_SINK_TYPE_VIDEO,
playbin->video_sink);
}
+ gst_play_sink_set_sink (playbin->playsink, GST_PLAY_SINK_TYPE_TEXT,
+ playbin->text_sink);
+ gst_play_sink_set_sink (playbin->playsink, GST_PLAY_SINK_TYPE_SUBPIC,
+ playbin->subpic_sink);
GST_SOURCE_GROUP_UNLOCK (group);
GST_LOG_OBJECT (playbin, "reconfigure sink");
diff --git a/gst/playback/gstplaysink.h b/gst/playback/gstplaysink.h
index 599e87df9..fd3cabde3 100644
--- a/gst/playback/gstplaysink.h
+++ b/gst/playback/gstplaysink.h
@@ -46,6 +46,7 @@ G_BEGIN_DECLS
* @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
*