mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

update for request pads change.

Browse source
This commit is contained in:
Wim Taymans 2011-11-03 17:58:57 +01:00
parent f4bee46072
commit 57fe2addef
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/playback/gstdecodebin2.c
View file

@ -2968,7 +2968,7 @@ gst_decode_group_control_demuxer_pad (GstDecodeGroup * group, GstPad * pad)
if (G_UNLIKELY (!group->multiqueue)) if (G_UNLIKELY (!group->multiqueue))
return NULL; return NULL;
if (!(sinkpad = gst_element_get_request_pad (group->multiqueue, "sink%d"))) { if (!(sinkpad = gst_element_get_request_pad (group->multiqueue, "sink_%u"))) {
GST_ERROR_OBJECT (dbin, "Couldn't get sinkpad from multiqueue"); GST_ERROR_OBJECT (dbin, "Couldn't get sinkpad from multiqueue");
return NULL; return NULL;
} }

2
gst/playback/gstplaybin2.c
View file

@ -2595,7 +2595,7 @@ pad_added_cb (GstElement * decodebin, GstPad * pad, GstSourceGroup * group)
/* get sinkpad for the new stream */ /* get sinkpad for the new stream */
if (select->selector) { if (select->selector) {
if ((sinkpad = gst_element_get_request_pad (select->selector, "sink%d"))) { if ((sinkpad = gst_element_get_request_pad (select->selector, "sink_%u"))) {
gulong notify_tags_handler = 0; gulong notify_tags_handler = 0;
NotifyTagsData *ntdata; NotifyTagsData *ntdata;

4
gst/playback/gstplaysink.c
View file

@ -2435,7 +2435,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
GST_DEBUG_OBJECT (playsink, "adding audio chain"); GST_DEBUG_OBJECT (playsink, "adding audio chain");
if (playsink->audio_tee_asrc == NULL) { if (playsink->audio_tee_asrc == NULL) {
playsink->audio_tee_asrc = playsink->audio_tee_asrc =
gst_element_get_request_pad (playsink->audio_tee, "src%d"); gst_element_get_request_pad (playsink->audio_tee, "src_%u");
} }
add_chain (GST_PLAY_CHAIN (playsink->audiochain), TRUE); add_chain (GST_PLAY_CHAIN (playsink->audiochain), TRUE);
activate_chain (GST_PLAY_CHAIN (playsink->audiochain), TRUE); activate_chain (GST_PLAY_CHAIN (playsink->audiochain), TRUE);
@ -2497,7 +2497,7 @@ gst_play_sink_reconfigure (GstPlaySink * playsink)
activate_chain (GST_PLAY_CHAIN (playsink->vischain), TRUE); activate_chain (GST_PLAY_CHAIN (playsink->vischain), TRUE);
if (playsink->audio_tee_vissrc == NULL) { if (playsink->audio_tee_vissrc == NULL) {
playsink->audio_tee_vissrc = playsink->audio_tee_vissrc =
gst_element_get_request_pad (playsink->audio_tee, "src%d"); gst_element_get_request_pad (playsink->audio_tee, "src_%u");
} }
gst_pad_link_full (playsink->audio_tee_vissrc, gst_pad_link_full (playsink->audio_tee_vissrc,
playsink->vischain->sinkpad, GST_PAD_LINK_CHECK_NOTHING); playsink->vischain->sinkpad, GST_PAD_LINK_CHECK_NOTHING);

6
tests/examples/dynamic/codec-select.c
View file

@ -180,14 +180,14 @@ make_pipeline (void)
gst_bin_add (GST_BIN (result), encoder); gst_bin_add (GST_BIN (result), encoder);
srcpad = gst_element_get_request_pad (outputselect, "src%d"); srcpad = gst_element_get_request_pad (outputselect, "src_%u");
sinkpad = gst_element_get_static_pad (encoder, "sink"); sinkpad = gst_element_get_static_pad (encoder, "sink");
gst_pad_link (srcpad, sinkpad); gst_pad_link (srcpad, sinkpad);
gst_object_unref (srcpad); gst_object_unref (srcpad);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
srcpad = gst_element_get_static_pad (encoder, "src"); srcpad = gst_element_get_static_pad (encoder, "src");
sinkpad = gst_element_get_request_pad (inputselect, "sink%d"); sinkpad = gst_element_get_request_pad (inputselect, "sink_%u");
gst_pad_link (srcpad, sinkpad); gst_pad_link (srcpad, sinkpad);
gst_object_unref (srcpad); gst_object_unref (srcpad);
gst_object_unref (sinkpad); gst_object_unref (sinkpad);
@ -212,7 +212,7 @@ do_switch (GstElement * pipeline)
select = gst_bin_get_by_name (GST_BIN (pipeline), "select"); select = gst_bin_get_by_name (GST_BIN (pipeline), "select");
/* get the named pad */ /* get the named pad */
name = g_strdup_printf ("src%d", rand); name = g_strdup_printf ("src_%u", rand);
pad = gst_element_get_static_pad (select, name); pad = gst_element_get_static_pad (select, name);
g_free (name); g_free (name);

4
tests/icles/output-selector-test.c
View file

@ -124,7 +124,7 @@ main (gint argc, gchar * argv[])
/* link output 1 */ /* link output 1 */
sinkpad = gst_element_get_static_pad (c1, "sink"); sinkpad = gst_element_get_static_pad (c1, "sink");
osel_src1 = gst_element_get_request_pad (osel, "src%d"); osel_src1 = gst_element_get_request_pad (osel, "src_%u");
if (gst_pad_link (osel_src1, sinkpad) != GST_PAD_LINK_OK) { if (gst_pad_link (osel_src1, sinkpad) != GST_PAD_LINK_OK) {
g_print ("linking output 1 converter failed\n"); g_print ("linking output 1 converter failed\n");
return -1; return -1;
@ -138,7 +138,7 @@ main (gint argc, gchar * argv[])
/* link output 2 */ /* link output 2 */
sinkpad = gst_element_get_static_pad (c2, "sink"); sinkpad = gst_element_get_static_pad (c2, "sink");
osel_src2 = gst_element_get_request_pad (osel, "src%d"); osel_src2 = gst_element_get_request_pad (osel, "src_%u");
if (gst_pad_link (osel_src2, sinkpad) != GST_PAD_LINK_OK) { if (gst_pad_link (osel_src2, sinkpad) != GST_PAD_LINK_OK) {
g_print ("linking output 2 converter failed\n"); g_print ("linking output 2 converter failed\n");
return -1; return -1;