From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 15 Nov 2011 16:58:19 +0000 (+0100)
Subject: _query_peer_*() -> _peer_query_*()
X-Git-Tag: 1.19.3~511^2~7127
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28157e6f21639c8bb6b64e3d6a1cbfbbc8afcb1d;p=platform%2Fupstream%2Fgstreamer.git

_query_peer_*() -> _peer_query_*()
---

diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
index 15383f6..d9abec1 100644
--- a/gst-libs/gst/audio/gstaudiodecoder.c
+++ b/gst-libs/gst/audio/gstaudiodecoder.c
@@ -1800,7 +1800,7 @@ gst_audio_decoder_src_query (GstPad * pad, GstQuery * query)
       if (format == GST_FORMAT_TIME && gst_audio_decoder_do_byte (dec)) {
         gint64 value;
 
-        if (gst_pad_query_peer_duration (dec->sinkpad, GST_FORMAT_BYTES,
+        if (gst_pad_peer_query_duration (dec->sinkpad, GST_FORMAT_BYTES,
                 &value)) {
           GST_LOG_OBJECT (dec, "upstream size %" G_GINT64_FORMAT, value);
           if (gst_pad_query_convert (dec->sinkpad, GST_FORMAT_BYTES, value,
diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
index 31eb1c9..8107b44 100644
--- a/gst-libs/gst/tag/gsttagdemux.c
+++ b/gst-libs/gst/tag/gsttagdemux.c
@@ -730,7 +730,7 @@ gst_tag_demux_get_upstream_size (GstTagDemux * tagdemux)
   if (tagdemux->priv->upstream_size > 0)
     return TRUE;
 
-  if (!gst_pad_query_peer_duration (tagdemux->priv->sinkpad, GST_FORMAT_BYTES,
+  if (!gst_pad_peer_query_duration (tagdemux->priv->sinkpad, GST_FORMAT_BYTES,
           &len) || len <= 0) {
     return FALSE;
   }
diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index e8c80f4..9396236 100644
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -373,7 +373,7 @@ gst_adder_query_duration (GstAdder * adder, GstQuery * query)
         gint64 duration;
 
         /* ask sink peer for duration */
-        res &= gst_pad_query_peer_duration (pad, format, &duration);
+        res &= gst_pad_peer_query_duration (pad, format, &duration);
         /* take max from all valid return values */
         if (res) {
           /* valid unknown length, stop searching */
diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 02b5628..0caa184 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -2226,7 +2226,7 @@ check_upstream_seekable (GstDecodeBin * dbin, GstPad * pad)
   /* try harder to query upstream size if we didn't get it the first time */
   if (dbin->upstream_seekable && stop == -1) {
     GST_DEBUG_OBJECT (dbin, "doing duration query to fix up unset stop");
-    gst_pad_query_peer_duration (pad, GST_FORMAT_BYTES, &stop);
+    gst_pad_peer_query_duration (pad, GST_FORMAT_BYTES, &stop);
   }
 
   /* if upstream doesn't know the size, it's likely that it's not seekable in
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index 8a950f9..6fc3bd3 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -3117,7 +3117,7 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
 
     sinkcaps = gst_pad_query_caps (sinkpad, NULL);
     if (!gst_caps_is_any (sinkcaps))
-      ret = !gst_pad_accept_caps (sinkpad, caps);
+      ret = !gst_pad_query_accept_caps (sinkpad, caps);
     gst_caps_unref (sinkcaps);
     gst_object_unref (sinkpad);
   } else {
@@ -3149,7 +3149,7 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
 
       sinkcaps = gst_pad_query_caps (sinkpad, NULL);
       if (!gst_caps_is_any (sinkcaps))
-        ret = !gst_pad_accept_caps (sinkpad, caps);
+        ret = !gst_pad_query_accept_caps (sinkpad, caps);
       gst_caps_unref (sinkcaps);
       gst_object_unref (sinkpad);
     }
@@ -3170,7 +3170,7 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps,
 
       sinkcaps = gst_pad_query_caps (sinkpad, NULL);
       if (!gst_caps_is_any (sinkcaps))
-        ret = !gst_pad_accept_caps (sinkpad, caps);
+        ret = !gst_pad_query_accept_caps (sinkpad, caps);
       gst_caps_unref (sinkcaps);
       gst_object_unref (sinkpad);
     }
@@ -3204,7 +3204,7 @@ sink_accepts_caps (GstElement * sink, GstCaps * caps)
   if ((sinkpad = gst_element_get_static_pad (sink, "sink"))) {
     /* Got the sink pad, now let's see if the element actually does accept the
      * caps that we have */
-    if (!gst_pad_accept_caps (sinkpad, caps)) {
+    if (!gst_pad_query_accept_caps (sinkpad, caps)) {
       gst_object_unref (sinkpad);
       return FALSE;
     }
diff --git a/gst/playback/gstsubtitleoverlay.c b/gst/playback/gstsubtitleoverlay.c
index 34512d2..9d0ff96 100644
--- a/gst/playback/gstsubtitleoverlay.c
+++ b/gst/playback/gstsubtitleoverlay.c
@@ -802,7 +802,7 @@ _pad_blocked_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
     GstPad *target =
         gst_ghost_pad_get_target (GST_GHOST_PAD_CAST (self->subtitle_sinkpad));
 
-    if (target && gst_pad_accept_caps (target, subcaps)) {
+    if (target && gst_pad_query_accept_caps (target, subcaps)) {
       GST_DEBUG_OBJECT (pad, "Target accepts caps");
 
       gst_object_unref (target);
@@ -1719,7 +1719,7 @@ gst_subtitle_overlay_video_sink_setcaps (GstSubtitleOverlay * self,
 
   GST_SUBTITLE_OVERLAY_LOCK (self);
 
-  if (!target || !gst_pad_accept_caps (target, caps)) {
+  if (!target || !gst_pad_query_accept_caps (target, caps)) {
     GST_DEBUG_OBJECT (target, "Target did not accept caps -- reconfiguring");
 
     block_subtitle (self);
@@ -1887,7 +1887,7 @@ gst_subtitle_overlay_subtitle_sink_setcaps (GstSubtitleOverlay * self,
   GST_SUBTITLE_OVERLAY_LOCK (self);
   gst_caps_replace (&self->subcaps, caps);
 
-  if (target && gst_pad_accept_caps (target, caps)) {
+  if (target && gst_pad_query_accept_caps (target, caps)) {
     GST_DEBUG_OBJECT (self, "Target accepts caps");
     GST_SUBTITLE_OVERLAY_UNLOCK (self);
     goto out;