diff options
-rw-r--r-- | docs/libs/farsight2-libs-sections.txt | 2 | ||||
-rw-r--r-- | gst-libs/gst/farsight/fs-stream.c | 4 | ||||
-rw-r--r-- | gst-libs/gst/farsight/fs-stream.h | 2 | ||||
-rw-r--r-- | python/pyfarsight.defs | 4 | ||||
-rw-r--r-- | tests/check/raw/conference.c | 2 | ||||
-rw-r--r-- | tests/check/rtp/generic.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/docs/libs/farsight2-libs-sections.txt b/docs/libs/farsight2-libs-sections.txt index 22758dfd..69e987bc 100644 --- a/docs/libs/farsight2-libs-sections.txt +++ b/docs/libs/farsight2-libs-sections.txt @@ -30,7 +30,7 @@ fs_stream_add_remote_candidates fs_stream_set_remote_codecs fs_stream_force_remote_candidates fs_stream_add_id -fs_stream_get_src_pads_iterator +fs_stream_iterate_src_pads fs_stream_set_transmitter fs_stream_emit_error fs_stream_emit_src_pad_added diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c index 45860b92..33da6cb4 100644 --- a/gst-libs/gst/farsight/fs-stream.c +++ b/gst-libs/gst/farsight/fs-stream.c @@ -577,7 +577,7 @@ src_pad_iterator_item_func (GstIterator*iter, gpointer item) } /** - * fs_stream_get_src_pads_iterator: + * fs_stream_iterate_src_pads: * @stream: a #FsStream * * Creates a #GstIterator that can be used to iterate the src pads of this @@ -588,7 +588,7 @@ src_pad_iterator_item_func (GstIterator*iter, gpointer item) */ GstIterator * -fs_stream_get_src_pads_iterator (FsStream *stream) +fs_stream_iterate_src_pads (FsStream *stream) { return gst_iterator_new_list (GST_TYPE_PAD, stream->priv->mutex, &stream->priv->src_pads_cookie, &stream->priv->src_pads, diff --git a/gst-libs/gst/farsight/fs-stream.h b/gst-libs/gst/farsight/fs-stream.h index 2070e62c..3a614294 100644 --- a/gst-libs/gst/farsight/fs-stream.h +++ b/gst-libs/gst/farsight/fs-stream.h @@ -177,7 +177,7 @@ void fs_stream_emit_src_pad_added (FsStream *stream, GstPad *pad, FsCodec *codec); -GstIterator *fs_stream_get_src_pads_iterator (FsStream *stream); +GstIterator *fs_stream_iterate_src_pads (FsStream *stream); gboolean fs_stream_set_transmitter (FsStream *stream, const gchar *transmitter, diff --git a/python/pyfarsight.defs b/python/pyfarsight.defs index 04f634fb..1979c57a 100644 --- a/python/pyfarsight.defs +++ b/python/pyfarsight.defs @@ -638,10 +638,10 @@ ) ) -(define-method get_src_pads_iterator +(define-method iterate_src_pads (of-object "FsStream") (unblock-threads t) - (c-name "fs_stream_get_src_pads_iterator") + (c-name "fs_stream_iterate_src_pads") (return-type "GstIterator*") ) diff --git a/tests/check/raw/conference.c b/tests/check/raw/conference.c index ac9befe9..e63cdc60 100644 --- a/tests/check/raw/conference.c +++ b/tests/check/raw/conference.c @@ -273,7 +273,7 @@ pad_count_fold (gpointer pad, GValue *val, gpointer user_data) guint count_stream_pads (FsStream *stream) { - GstIterator *iter = fs_stream_get_src_pads_iterator (stream); + GstIterator *iter = fs_stream_iterate_src_pads (stream); guint count = 0; fail_if (iter == NULL); diff --git a/tests/check/rtp/generic.c b/tests/check/rtp/generic.c index fc0bb3af..b0f7e0d7 100644 --- a/tests/check/rtp/generic.c +++ b/tests/check/rtp/generic.c @@ -217,7 +217,7 @@ pad_count_fold (gpointer pad, GValue *val, gpointer user_data) guint count_stream_pads (FsStream *stream) { - GstIterator *iter = fs_stream_get_src_pads_iterator (stream); + GstIterator *iter = fs_stream_iterate_src_pads (stream); guint count = 0; fail_if (iter == NULL); |