mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-06-08 17:19:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix waymans bug

Browse source 
Original commit message from CVS:
fix waymans bug
This commit is contained in:
Andy Wingo 2005-02-21 11:56:50 +00:00
parent 1a5201826c
commit d94be30f9b
3 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
gst/gstelement.c
View file

@ -1737,7 +1737,7 @@ gst_element_commit_state (GstElement * element)
g_signal_emit (G_OBJECT (element), gst_element_signals[STATE_CHANGE],
0, old_state, pending);
message = gst_message_new_state_changed (GST_OBJECT (element),
old_state, pending));
old_state, pending);
gst_element_post_message (element, message);
GST_STATE_BROADCAST (element);
}
@ -1757,7 +1757,8 @@ gst_element_commit_state (GstElement * element)
* MT safe.
*/
GstElementStateReturn
gst_element_set_state (GstElement * element, GstElementState state) {
gst_element_set_state (GstElement * element, GstElementState state)
{
GstElementClass *oclass;
GstElementState current;
GstElementStateReturn return_val = GST_STATE_SUCCESS;
@ -1879,7 +1880,7 @@ invalid_return:
* when pads are added to elements?
*/
static gboolean
gst_element_pads_activate (GstElement * element, gboolean active)
gst_element_pads_activate (GstElement * element, gboolean active)
{
GList *pads;
gboolean result;
@ -1970,7 +1971,8 @@ restart:
}
/* is called with STATE_LOCK */
static GstElementStateReturn gst_element_change_state (GstElement * element)
static GstElementStateReturn
gst_element_change_state (GstElement * element)
{
GstElementState old_state;
gint old_pending, old_transition;
@ -2046,14 +2048,16 @@ static GstElementStateReturn gst_element_change_state (GstElement * element)
*
* Returns: the #GstElementFactory used for creating this element.
*/
GstElementFactory *gst_element_get_factory (GstElement * element)
GstElementFactory *
gst_element_get_factory (GstElement * element)
{
g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);
return GST_ELEMENT_GET_CLASS (element)->elementfactory;
}
static void gst_element_dispose (GObject * object)
static void
gst_element_dispose (GObject * object)
{
GstElement *element = GST_ELEMENT (object);
@ -2081,7 +2085,8 @@ static void gst_element_dispose (GObject * object)
G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void gst_element_finalize (GObject * object)
static void
gst_element_finalize (GObject * object)
{
GstElement *element = GST_ELEMENT (object);
@ -2110,14 +2115,13 @@ static void gst_element_finalize (GObject * object)
* Returns: the new #xmlNodePtr.
*/
static xmlNodePtr
gst_element_save_thyself (GstObject * object, xmlNodePtr parent)
gst_element_save_thyself (GstObject * object, xmlNodePtr parent)
{
GList *pads;
GstElementClass *oclass;
GParamSpec **specs, *spec;
gint nspecs, i;
GValue value = {
0,};
GValue value = { 0, };
GstElement *element;
g_return_val_if_fail (GST_IS_ELEMENT (object), parent);
@ -2187,7 +2191,8 @@ static xmlNodePtr
return parent;
}
static void gst_element_restore_thyself (GstObject * object, xmlNodePtr self)
static void
gst_element_restore_thyself (GstObject * object, xmlNodePtr self)
{
xmlNodePtr children;
GstElement *element;
@ -2235,7 +2240,7 @@ static void gst_element_restore_thyself (GstObject * object, xmlNodePtr self)
#endif /* GST_DISABLE_LOADSAVE */
static void
gst_element_set_manager_func (GstElement * element, GstPipeline * manager)
gst_element_set_manager_func (GstElement * element, GstPipeline * manager)
{
g_return_if_fail (GST_IS_ELEMENT (element));
@ -2248,7 +2253,8 @@ static void
GST_UNLOCK (element);
}
static void gst_element_set_bus_func (GstElement * element, GstBus * bus)
static void
gst_element_set_bus_func (GstElement * element, GstBus * bus)
{
g_return_if_fail (GST_IS_ELEMENT (element));
@ -2261,8 +2267,7 @@ static void gst_element_set_bus_func (GstElement * element, GstBus * bus)
}
static void
gst_element_set_scheduler_func (GstElement * element,
GstScheduler * scheduler)
gst_element_set_scheduler_func (GstElement * element, GstScheduler * scheduler)
{
g_return_if_fail (GST_IS_ELEMENT (element));
@ -2285,7 +2290,8 @@ static void
*
* MT safe.
*/
void gst_element_set_manager (GstElement * element, GstPipeline * manager)
void
gst_element_set_manager (GstElement * element, GstPipeline * manager)
{
GstElementClass *oclass;
@ -2308,7 +2314,8 @@ void gst_element_set_manager (GstElement * element, GstPipeline * manager)
*
* MT safe.
*/
GstPipeline *gst_element_get_manager (GstElement * element)
GstPipeline *
gst_element_get_manager (GstElement * element)
{
GstPipeline *result = NULL;
@ -2332,7 +2339,8 @@ GstPipeline *gst_element_get_manager (GstElement * element)
*
* MT safe.
*/
void gst_element_set_bus (GstElement * element, GstBus * bus)
void
gst_element_set_bus (GstElement * element, GstBus * bus)
{
GstElementClass *oclass;
@ -2354,7 +2362,8 @@ void gst_element_set_bus (GstElement * element, GstBus * bus)
*
* MT safe.
*/
GstBus *gst_element_get_bus (GstElement * element)
GstBus *
gst_element_get_bus (GstElement * element)
{
GstBus *result = NULL;
@ -2377,7 +2386,8 @@ GstBus *gst_element_get_bus (GstElement * element)
*
* MT safe.
*/
void gst_element_set_scheduler (GstElement * element, GstScheduler * scheduler)
void
gst_element_set_scheduler (GstElement * element, GstScheduler * scheduler)
{
GstElementClass *oclass;
@ -2399,7 +2409,8 @@ void gst_element_set_scheduler (GstElement * element, GstScheduler * scheduler)
*
* MT safe.
*/
GstScheduler *gst_element_get_scheduler (GstElement * element)
GstScheduler *
gst_element_get_scheduler (GstElement * element)
{
GstScheduler *result = NULL;

3
tests/benchmarks/mass-elements.c
View file

@ -95,7 +95,8 @@ main (gint argc, gchar * argv[])
GST_TIME_ARGS (end - start));
start = gst_get_current_time ();
while (gst_bin_iterate (GST_BIN (pipeline)));
gst_bus_poll (gst_element_get_bus (pipeline),
GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
end = gst_get_current_time ();
g_print ("%" GST_TIME_FORMAT " - putting %u buffers through\n",
GST_TIME_ARGS (end - start), buffers);

3
tests/mass_elements.c
View file

@ -95,7 +95,8 @@ main (gint argc, gchar * argv[])
GST_TIME_ARGS (end - start));
start = gst_get_current_time ();
while (gst_bin_iterate (GST_BIN (pipeline)));
gst_bus_poll (gst_element_get_bus (pipeline),
GST_MESSAGE_EOS | GST_MESSAGE_ERROR, -1);
end = gst_get_current_time ();
g_print ("%" GST_TIME_FORMAT " - putting %u buffers through\n",
GST_TIME_ARGS (end - start), buffers);