mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback: update for ghostpad changes

Browse source
This commit is contained in:
Wim Taymans 2012-07-18 17:47:47 +02:00
parent c88b55c3a9
commit 0423329f91
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/playback/gstplaysink.c
View file

@ -1975,7 +1975,7 @@ gst_play_sink_sink_event (GstPad * pad, GstObject * parent, GstEvent * event,
} }
GST_DEBUG_OBJECT (pad, "Forwarding event %" GST_PTR_FORMAT, event); GST_DEBUG_OBJECT (pad, "Forwarding event %" GST_PTR_FORMAT, event);
ret = gst_proxy_pad_event_default (pad, parent, gst_event_ref (event)); ret = gst_pad_event_default (pad, parent, gst_event_ref (event));
if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) { if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
const GstSegment *segment; const GstSegment *segment;
@ -2214,7 +2214,7 @@ gst_play_sink_text_src_event (GstPad * pad, GstObject * parent,
goto out; goto out;
} }
ret = gst_proxy_pad_event_default (pad, parent, gst_event_ref (event)); ret = gst_pad_event_default (pad, parent, gst_event_ref (event));
out: out:
gst_event_unref (event); gst_event_unref (event);

4
gst/playback/gstplaysinkconvertbin.c
View file

@ -272,7 +272,7 @@ gst_play_sink_convert_bin_sink_event (GstPad * pad, GstObject * parent,
break; break;
} }
ret = gst_proxy_pad_event_default (pad, parent, gst_event_ref (event)); ret = gst_pad_event_default (pad, parent, gst_event_ref (event));
if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) { if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
GstSegment seg; GstSegment seg;
@ -464,7 +464,7 @@ gst_play_sink_convert_bin_query (GstPad * pad, GstObject * parent,
break; break;
} }
default: default:
res = gst_proxy_pad_query_default (pad, parent, query); res = gst_pad_query_default (pad, parent, query);
break; break;
} }
return res; return res;

14
gst/playback/gstsubtitleoverlay.c
View file

@ -1772,7 +1772,7 @@ gst_subtitle_overlay_src_proxy_event (GstPad * proxypad, GstObject * parent,
event = NULL; event = NULL;
ret = TRUE; ret = TRUE;
} else { } else {
ret = gst_proxy_pad_event_default (proxypad, parent, event); ret = gst_pad_event_default (proxypad, parent, event);
event = NULL; event = NULL;
} }
@ -1859,7 +1859,7 @@ gst_subtitle_overlay_video_sink_event (GstPad * pad, GstObject * parent,
break; break;
} }
ret = gst_proxy_pad_event_default (pad, parent, gst_event_ref (event)); ret = gst_pad_event_default (pad, parent, gst_event_ref (event));
if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) { if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
GST_DEBUG_OBJECT (pad, "segment event: %" GST_PTR_FORMAT, event); GST_DEBUG_OBJECT (pad, "segment event: %" GST_PTR_FORMAT, event);
@ -1999,7 +1999,6 @@ static GstPadLinkReturn
gst_subtitle_overlay_subtitle_sink_link (GstPad * pad, GstPad * peer) gst_subtitle_overlay_subtitle_sink_link (GstPad * pad, GstPad * peer)
{ {
GstSubtitleOverlay *self = GST_SUBTITLE_OVERLAY (gst_pad_get_parent (pad)); GstSubtitleOverlay *self = GST_SUBTITLE_OVERLAY (gst_pad_get_parent (pad));
GstPadLinkReturn ret;
GstCaps *caps; GstCaps *caps;
GST_DEBUG_OBJECT (pad, "Linking pad to peer %" GST_PTR_FORMAT, peer); GST_DEBUG_OBJECT (pad, "Linking pad to peer %" GST_PTR_FORMAT, peer);
@ -2026,10 +2025,9 @@ gst_subtitle_overlay_subtitle_sink_link (GstPad * pad, GstPad * peer)
gst_caps_unref (caps); gst_caps_unref (caps);
} }
ret = gst_ghost_pad_link_default (pad, peer);
gst_object_unref (self); gst_object_unref (self);
return ret;
return GST_PAD_LINK_OK;
} }
static void static void
@ -2045,8 +2043,6 @@ gst_subtitle_overlay_subtitle_sink_unlink (GstPad * pad)
GST_DEBUG_OBJECT (pad, "Pad unlinking"); GST_DEBUG_OBJECT (pad, "Pad unlinking");
gst_caps_replace (&self->subcaps, NULL); gst_caps_replace (&self->subcaps, NULL);
gst_ghost_pad_unlink_default (pad);
GST_SUBTITLE_OVERLAY_LOCK (self); GST_SUBTITLE_OVERLAY_LOCK (self);
self->subtitle_error = FALSE; self->subtitle_error = FALSE;
@ -2117,7 +2113,7 @@ gst_subtitle_overlay_subtitle_sink_event (GstPad * pad, GstObject * parent,
break; break;
} }
ret = gst_proxy_pad_event_default (pad, parent, gst_event_ref (event)); ret = gst_pad_event_default (pad, parent, gst_event_ref (event));
if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) { if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
const GstSegment *eventsegment; const GstSegment *eventsegment;