From fb3da828e5d2991e12564b44f7b1a844fb493f8c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 6 May 2011 12:19:16 +0200 Subject: [PATCH] element: rename gst_element_lost_state_full() Rename gst_element_lost_state_full() to gst_element_lost_state() and remove the old method name. --- gst/gstelement.c | 26 ++------------------------ gst/gstelement.h | 3 +-- libs/gst/base/gstbasesink.c | 4 ++-- win32/common/libgstreamer.def | 1 - 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/gst/gstelement.c b/gst/gstelement.c index b8c72e90af..225a42111f 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -2343,7 +2343,7 @@ complete: } /** - * gst_element_lost_state_full: + * gst_element_lost_state: * @element: a #GstElement the state is lost of * @new_base_time: if a new base time should be distributed * @@ -2365,13 +2365,9 @@ complete: * * This function is used internally and should normally not be called from * plugins or applications. - * - * MT safe. - * - * Since: 0.10.24 */ void -gst_element_lost_state_full (GstElement * element, gboolean new_base_time) +gst_element_lost_state (GstElement * element, gboolean new_base_time) { GstState old_state, new_state; GstMessage *message; @@ -2432,24 +2428,6 @@ only_async_start: } } -/** - * gst_element_lost_state: - * @element: a #GstElement the state is lost of - * - * Brings the element to the lost state. This function calls - * gst_element_lost_state_full() with the new_base_time set to %TRUE. - * - * This function is used internally and should normally not be called from - * plugins or applications. - * - * MT safe. - */ -void -gst_element_lost_state (GstElement * element) -{ - gst_element_lost_state_full (element, TRUE); -} - /** * gst_element_set_state: * @element: a #GstElement to change state of. diff --git a/gst/gstelement.h b/gst/gstelement.h index da3133e58b..4ac7d16ee3 100644 --- a/gst/gstelement.h +++ b/gst/gstelement.h @@ -804,8 +804,7 @@ GstStateChangeReturn gst_element_change_state (GstElement * element, GstStateChange transition); GstStateChangeReturn gst_element_continue_state (GstElement * element, GstStateChangeReturn ret); -void gst_element_lost_state (GstElement * element); -void gst_element_lost_state_full (GstElement * element, gboolean new_base_time); +void gst_element_lost_state (GstElement * element, gboolean new_base_time); /* factory management */ GstElementFactory* gst_element_get_factory (GstElement *element); diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index c2adb6767a..8eae0e7758 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -3320,7 +3320,7 @@ gst_base_sink_flush_start (GstBaseSink * basesink, GstPad * pad) * prerolled buffer */ basesink->playing_async = TRUE; if (basesink->priv->async_enabled) { - gst_element_lost_state (GST_ELEMENT_CAST (basesink)); + gst_element_lost_state (GST_ELEMENT_CAST (basesink), TRUE); } else { basesink->priv->have_latency = TRUE; } @@ -3978,7 +3978,7 @@ gst_base_sink_perform_step (GstBaseSink * sink, GstPad * pad, GstEvent * event) sink->playing_async = TRUE; priv->pending_step.need_preroll = TRUE; sink->need_preroll = FALSE; - gst_element_lost_state_full (GST_ELEMENT_CAST (sink), FALSE); + gst_element_lost_state (GST_ELEMENT_CAST (sink), FALSE); } else { sink->priv->have_latency = TRUE; sink->need_preroll = FALSE; diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index c351440f7f..9224d95133 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -349,7 +349,6 @@ EXPORTS gst_element_link_pads_filtered gst_element_link_pads_full gst_element_lost_state - gst_element_lost_state_full gst_element_make_from_uri gst_element_message_full gst_element_no_more_pads