aggregator: rename _get_buffer() -> _peek_buffer() and _steal -> _pop

https://bugzilla.gnome.org/show_bug.cgi?id=791204

diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index 957f3a8..515eb76 100644 (file)
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -241,8 +241,8 @@ gst_aggregator_get_type
 <TITLE>GstAggregatorPad</TITLE>
 GstAggregatorPad
 GstAggregatorPadClass
-gst_aggregator_pad_steal_buffer
-gst_aggregator_pad_get_buffer
+gst_aggregator_pad_pop_buffer
+gst_aggregator_pad_peek_buffer
 gst_aggregator_pad_drop_buffer
 gst_aggregator_pad_is_eos
 <SUBSECTION Standard>

diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c
index 797ed32..f7eaf3b 100644 (file)
--- a/libs/gst/base/gstaggregator.c
+++ b/libs/gst/base/gstaggregator.c
@@ -41,9 +41,9 @@
  *  * When data is queued on all pads, the aggregate vmethod is called.
  *
  *  * One can peek at the data on any given GstAggregatorPad with the
- *    gst_aggregator_pad_get_buffer () method, and take ownership of it
- *    with the gst_aggregator_pad_steal_buffer () method. When a buffer
- *    has been taken with steal_buffer (), a new buffer can be queued
+ *    gst_aggregator_pad_peek_buffer () method, and remove it from the pad
+ *    with the gst_aggregator_pad_pop_buffer () method. When a buffer
+ *    has been taken with pop_buffer (), a new buffer can be queued
  *    on that pad.
  *
  *  * If the subclass wishes to push a buffer downstream in its aggregate
@@ -2815,7 +2815,7 @@ gst_aggregator_pad_clip_buffer_unlocked (GstAggregatorPad * pad)
 }
 
 /**
- * gst_aggregator_pad_steal_buffer:
+ * gst_aggregator_pad_pop_buffer:
  * @pad: the pad to get buffer from
  *
  * Steal the ref to the buffer currently queued in @pad.
@@ -2824,7 +2824,7 @@ gst_aggregator_pad_clip_buffer_unlocked (GstAggregatorPad * pad)
  *   queued. You should unref the buffer after usage.
  */
 GstBuffer *
-gst_aggregator_pad_steal_buffer (GstAggregatorPad * pad)
+gst_aggregator_pad_pop_buffer (GstAggregatorPad * pad)
 {
   GstBuffer *buffer;
 
@@ -2858,7 +2858,7 @@ gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad)
 {
   GstBuffer *buf;
 
-  buf = gst_aggregator_pad_steal_buffer (pad);
+  buf = gst_aggregator_pad_pop_buffer (pad);
 
   if (buf == NULL)
     return FALSE;
@@ -2868,7 +2868,7 @@ gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad)
 }
 
 /**
- * gst_aggregator_pad_get_buffer:
+ * gst_aggregator_pad_peek_buffer:
  * @pad: the pad to get buffer from
  *
  * Returns: (transfer full): A reference to the buffer in @pad or
@@ -2876,7 +2876,7 @@ gst_aggregator_pad_drop_buffer (GstAggregatorPad * pad)
  * usage.
  */
 GstBuffer *
-gst_aggregator_pad_get_buffer (GstAggregatorPad * pad)
+gst_aggregator_pad_peek_buffer (GstAggregatorPad * pad)
 {
   GstBuffer *buffer;
 

diff --git a/libs/gst/base/gstaggregator.h b/libs/gst/base/gstaggregator.h
index a2bff12..d350034 100644 (file)
--- a/libs/gst/base/gstaggregator.h
+++ b/libs/gst/base/gstaggregator.h
@@ -98,10 +98,10 @@ GType gst_aggregator_pad_get_type           (void);
  ***************************/
 
 GST_EXPORT
-GstBuffer * gst_aggregator_pad_steal_buffer (GstAggregatorPad *  pad);
+GstBuffer * gst_aggregator_pad_pop_buffer   (GstAggregatorPad *  pad);
 
 GST_EXPORT
-GstBuffer * gst_aggregator_pad_get_buffer   (GstAggregatorPad *  pad);
+GstBuffer * gst_aggregator_pad_peek_buffer  (GstAggregatorPad *  pad);
 
 GST_EXPORT
 gboolean    gst_aggregator_pad_drop_buffer  (GstAggregatorPad *  pad);

diff --git a/tests/check/libs/aggregator.c b/tests/check/libs/aggregator.c
index 8756c78..53ef378 100644 (file)
--- a/tests/check/libs/aggregator.c
+++ b/tests/check/libs/aggregator.c
@@ -90,7 +90,7 @@ gst_test_aggregator_aggregate (GstAggregator * aggregator, gboolean timeout)
           all_eos = FALSE;
 
         if (testagg->gap_expected == TRUE) {
-          buf = gst_aggregator_pad_get_buffer (pad);
+          buf = gst_aggregator_pad_peek_buffer (pad);
           fail_unless (buf);
           fail_unless (GST_BUFFER_PTS (buf) == TEST_GAP_PTS);
           fail_unless (GST_BUFFER_DURATION (buf) == TEST_GAP_DURATION);

diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def
index ff2b844..cba1a18 100644 (file)
--- a/win32/common/libgstbase.def
+++ b/win32/common/libgstbase.def
@@ -36,10 +36,10 @@ EXPORTS
        gst_aggregator_get_latency
        gst_aggregator_get_type
        gst_aggregator_pad_drop_buffer
-       gst_aggregator_pad_get_buffer
        gst_aggregator_pad_get_type
        gst_aggregator_pad_is_eos
-       gst_aggregator_pad_steal_buffer
+       gst_aggregator_pad_peek_buffer
+       gst_aggregator_pad_pop_buffer
        gst_aggregator_set_latency
        gst_aggregator_set_src_caps
        gst_base_parse_add_index_entry