_query_peer_*() -> _peer_query_*()

diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index 27fa7fc..8bfb90b 100644 (file)
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -1670,9 +1670,9 @@ gst_pad_query_default
 gst_pad_query_position
 gst_pad_query_duration
 gst_pad_query_convert
-gst_pad_query_peer_position
-gst_pad_query_peer_duration
-gst_pad_query_peer_convert
+gst_pad_peer_query_position
+gst_pad_peer_query_duration
+gst_pad_peer_query_convert
 gst_pad_set_query_function
 GstPadQueryFunction
 gst_pad_set_iterate_internal_links_function

diff --git a/gst/gstutils.c b/gst/gstutils.c
index 76154f5..0040672 100644 (file)
--- a/gst/gstutils.c
+++ b/gst/gstutils.c
@@ -2881,7 +2881,7 @@ gst_pad_query_position (GstPad * pad, GstFormat format, gint64 * cur)
 }
 
 /**
- * gst_pad_query_peer_position:
+ * gst_pad_peer_query_position:
  * @pad: a #GstPad on whose peer to invoke the position query on.
  *       Must be a sink pad.
  * @format: the #GstFormat requested
@@ -2893,7 +2893,7 @@ gst_pad_query_position (GstPad * pad, GstFormat format, gint64 * cur)
  * Returns: TRUE if the query could be performed.
  */
 gboolean
-gst_pad_query_peer_position (GstPad * pad, GstFormat format, gint64 * cur)
+gst_pad_peer_query_position (GstPad * pad, GstFormat format, gint64 * cur)
 {
   GstQuery *query;
   gboolean ret = FALSE;
@@ -2939,7 +2939,7 @@ gst_pad_query_duration (GstPad * pad, GstFormat format, gint64 * duration)
 }
 
 /**
- * gst_pad_query_peer_duration:
+ * gst_pad_peer_query_duration:
  * @pad: a #GstPad on whose peer pad to invoke the duration query on.
  *       Must be a sink pad.
  * @format: the #GstFormat requested
@@ -2951,7 +2951,7 @@ gst_pad_query_duration (GstPad * pad, GstFormat format, gint64 * duration)
  * Returns: TRUE if the query could be performed.
  */
 gboolean
-gst_pad_query_peer_duration (GstPad * pad, GstFormat format, gint64 * duration)
+gst_pad_peer_query_duration (GstPad * pad, GstFormat format, gint64 * duration)
 {
   GstQuery *query;
   gboolean ret = FALSE;
@@ -3005,7 +3005,7 @@ gst_pad_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
 }
 
 /**
- * gst_pad_query_peer_convert:
+ * gst_pad_peer_query_convert:
  * @pad: a #GstPad, on whose peer pad to invoke the convert query on.
  *       Must be a sink pad.
  * @src_format: a #GstFormat to convert from.
@@ -3019,7 +3019,7 @@ gst_pad_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
  * Returns: TRUE if the query could be performed.
  */
 gboolean
-gst_pad_query_peer_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
+gst_pad_peer_query_convert (GstPad * pad, GstFormat src_format, gint64 src_val,
     GstFormat dest_format, gint64 * dest_val)
 {
   GstQuery *query;

diff --git a/gst/gstutils.h b/gst/gstutils.h
index 7e6f32c..a3e0112 100644 (file)
--- a/gst/gstutils.h
+++ b/gst/gstutils.h
@@ -902,9 +902,9 @@ gboolean                gst_pad_query_duration          (GstPad *pad, GstFormat
 gboolean                gst_pad_query_convert           (GstPad *pad, GstFormat src_format, gint64 src_val,
                                                          GstFormat dest_format, gint64 *dest_val);
 
-gboolean                gst_pad_query_peer_position     (GstPad *pad, GstFormat format, gint64 *cur);
-gboolean                gst_pad_query_peer_duration     (GstPad *pad, GstFormat format, gint64 *duration);
-gboolean                gst_pad_query_peer_convert      (GstPad *pad, GstFormat src_format, gint64 src_val,
+gboolean                gst_pad_peer_query_position     (GstPad *pad, GstFormat format, gint64 *cur);
+gboolean                gst_pad_peer_query_duration     (GstPad *pad, GstFormat format, gint64 *duration);
+gboolean                gst_pad_peer_query_convert      (GstPad *pad, GstFormat src_format, gint64 src_val,
                                                          GstFormat dest_format, gint64 *dest_val);
 
 /* bin functions */

diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c
index 09dff8e..5625b72 100644 (file)
--- a/libs/gst/base/gstbaseparse.c
+++ b/libs/gst/base/gstbaseparse.c
@@ -1588,7 +1588,7 @@ gst_base_parse_check_seekability (GstBaseParse * parse)
   /* try harder to query upstream size if we didn't get it the first time */
   if (seekable && stop == -1) {
     GST_DEBUG_OBJECT (parse, "doing duration query to fix up unset stop");
-    gst_pad_query_peer_duration (parse->sinkpad, GST_FORMAT_BYTES, &stop);
+    gst_pad_peer_query_duration (parse->sinkpad, GST_FORMAT_BYTES, &stop);
   }
 
   /* if upstream doesn't know the size, it's likely that it's not seekable in
@@ -1626,7 +1626,7 @@ gst_base_parse_check_upstream (GstBaseParse * parse)
 {
   gint64 stop;
 
-  if (gst_pad_query_peer_duration (parse->sinkpad, GST_FORMAT_TIME, &stop))
+  if (gst_pad_peer_query_duration (parse->sinkpad, GST_FORMAT_TIME, &stop))
     if (GST_CLOCK_TIME_IS_VALID (stop) && stop) {
       /* upstream has one, accept it also, and no further updates */
       gst_base_parse_set_duration (parse, GST_FORMAT_TIME, stop, 0);

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index aae4b2c..3d6741e 100644 (file)
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -4313,7 +4313,7 @@ gst_base_sink_pad_activate_pull (GstPad * pad, gboolean active)
     GST_OBJECT_UNLOCK (basesink);
 
     /* get the peer duration in bytes */
-    result = gst_pad_query_peer_duration (pad, GST_FORMAT_BYTES, &duration);
+    result = gst_pad_peer_query_duration (pad, GST_FORMAT_BYTES, &duration);
     if (result) {
       GST_DEBUG_OBJECT (basesink,
           "setting duration in bytes to %" G_GINT64_FORMAT, duration);
@@ -4682,7 +4682,7 @@ gst_base_sink_get_duration (GstBaseSink * basesink, GstFormat format,
      * using our cached value because it might change. Duration caching
      * should be done at a higher level. */
     res =
-        gst_pad_query_peer_duration (basesink->sinkpad, GST_FORMAT_BYTES,
+        gst_pad_peer_query_duration (basesink->sinkpad, GST_FORMAT_BYTES,
         &uduration);
     if (res) {
       basesink->segment.duration = uduration;
@@ -4739,7 +4739,7 @@ default_element_query (GstElement * element, GstQuery * query)
               &upstream);
           if (!res && upstream) {
             res =
-                gst_pad_query_peer_position (basesink->sinkpad, GST_FORMAT_TIME,
+                gst_pad_peer_query_position (basesink->sinkpad, GST_FORMAT_TIME,
                 &cur);
           }
           if (res) {
@@ -4747,7 +4747,7 @@ default_element_query (GstElement * element, GstQuery * query)
                 &upstream);
             if (!res && upstream) {
               res =
-                  gst_pad_query_peer_duration (basesink->sinkpad,
+                  gst_pad_peer_query_duration (basesink->sinkpad,
                   GST_FORMAT_TIME, &dur);
             }
           }

diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index 356689b..f4a6737 100644 (file)
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -777,7 +777,7 @@ update_buffering (GstQueue2 * queue)
           mode = GST_BUFFERING_DOWNLOAD;
 
         if (queue->byte_in_rate > 0) {
-          if (gst_pad_query_peer_duration (queue->sinkpad, GST_FORMAT_BYTES,
+          if (gst_pad_peer_query_duration (queue->sinkpad, GST_FORMAT_BYTES,
                   &duration)) {
             buffering_left =
                 (gdouble) ((duration -
@@ -2475,7 +2475,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstQuery * query)
           duration = writing_pos;
         } else {
           /* get duration of upstream in bytes */
-          peer_res = gst_pad_query_peer_duration (queue->sinkpad,
+          peer_res = gst_pad_peer_query_duration (queue->sinkpad,
               GST_FORMAT_BYTES, &duration);
         }
 
@@ -2598,7 +2598,7 @@ gst_queue2_update_upstream_size (GstQueue2 * queue)
 {
   gint64 upstream_size = -1;
 
-  if (gst_pad_query_peer_duration (queue->sinkpad, GST_FORMAT_BYTES,
+  if (gst_pad_peer_query_duration (queue->sinkpad, GST_FORMAT_BYTES,
           &upstream_size)) {
     GST_INFO_OBJECT (queue, "upstream size: %" G_GINT64_FORMAT, upstream_size);
     queue->upstream_size = upstream_size;