[015/906] Fix up all the state change functions.

This commit is contained in:
Jan Schmidt 2005-09-05 17:20:28 +00:00 committed by Matthew Waters
parent dcafe8705e
commit cb9baa0736

View file

@ -935,8 +935,8 @@ gst_glimagesink_sink_link (GstPad * pad, const GstCaps * caps)
return GST_PAD_LINK_OK; return GST_PAD_LINK_OK;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_glimagesink_change_state (GstElement * element) gst_glimagesink_change_state (GstElement * element, GstStateChange transition)
{ {
GstGLImageSink *glimagesink; GstGLImageSink *glimagesink;
@ -944,32 +944,32 @@ gst_glimagesink_change_state (GstElement * element)
glimagesink = GST_GLIMAGESINK (element); glimagesink = GST_GLIMAGESINK (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
/* Initializing the XContext */ /* Initializing the XContext */
if (!glimagesink->xcontext) { if (!glimagesink->xcontext) {
glimagesink->xcontext = gst_glimagesink_xcontext_get (glimagesink); glimagesink->xcontext = gst_glimagesink_xcontext_get (glimagesink);
if (!glimagesink->xcontext) if (!glimagesink->xcontext)
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
printf ("null to ready done\n"); printf ("null to ready done\n");
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
printf ("ready to paused\n"); printf ("ready to paused\n");
//if (glimagesink->window) // not needed with OpenGL //if (glimagesink->window) // not needed with OpenGL
// gst_glimagesink_xwindow_clear (glimagesink, glimagesink->window); // gst_glimagesink_xwindow_clear (glimagesink, glimagesink->window);
glimagesink->time = 0; glimagesink->time = 0;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
glimagesink->framerate = 0; glimagesink->framerate = 0;
GST_VIDEOSINK_WIDTH (glimagesink) = 0; GST_VIDEOSINK_WIDTH (glimagesink) = 0;
GST_VIDEOSINK_HEIGHT (glimagesink) = 0; GST_VIDEOSINK_HEIGHT (glimagesink) = 0;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (glimagesink->glimage) { if (glimagesink->glimage) {
gst_glimagesink_ximage_destroy (glimagesink, glimagesink->glimage); gst_glimagesink_ximage_destroy (glimagesink, glimagesink->glimage);
glimagesink->glimage = NULL; glimagesink->glimage = NULL;
@ -991,9 +991,9 @@ gst_glimagesink_change_state (GstElement * element)
} }
if (GST_ELEMENT_CLASS (parent_class)->change_state) if (GST_ELEMENT_CLASS (parent_class)->change_state)
return GST_ELEMENT_CLASS (parent_class)->change_state (element); return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static void static void