mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 00:32:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

All plugins updated for element state changes.

Browse source 
Original commit message from CVS:
2005-09-02  Andy Wingo  <wingo@pobox.com>

* All plugins updated for element state changes.
This commit is contained in:
Andy Wingo 2005-09-02 15:44:50 +00:00
parent e6280d445d
commit 7ebd7b97d4
94 changed files with 810 additions and 793 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
check/elements/level.c
View file

@ -103,7 +103,8 @@ GST_START_TEST (test_int16)
g_object_set (level, "message", TRUE, "interval", 0.1, NULL); g_object_set (level, "message", TRUE, "interval", 0.1, NULL);
fail_unless (gst_element_set_state (level, fail_unless (gst_element_set_state (level,
GST_STATE_PLAYING) == GST_STATE_SUCCESS, "could not set to playing"); GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
"could not set to playing");
/* create a fake 0.1 sec buffer with a half-amplitude block signal */ /* create a fake 0.1 sec buffer with a half-amplitude block signal */
inbuffer = gst_buffer_new_and_alloc (400); inbuffer = gst_buffer_new_and_alloc (400);

2
examples/gstplay/player.c
View file

@ -158,7 +158,7 @@ main (int argc, char *argv[])
/* Change state to PLAYING */ /* Change state to PLAYING */
if (gst_element_set_state (GST_ELEMENT (play), if (gst_element_set_state (GST_ELEMENT (play),
GST_STATE_PLAYING) == GST_STATE_FAILURE) GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE)
g_error ("Could not set state to PLAYING"); g_error ("Could not set state to PLAYING");
g_timeout_add (20000, (GSourceFunc) seek_timer, play); g_timeout_add (20000, (GSourceFunc) seek_timer, play);

3
examples/stats/mp2ogg.c
View file

@ -59,7 +59,8 @@ main (gint argc, gchar * argv[])
dec_sink = gst_element_get_pad (decoder, "sink"); dec_sink = gst_element_get_pad (decoder, "sink");
enc_src = gst_element_get_pad (encoder, "src"); enc_src = gst_element_get_pad (encoder, "src");
if (gst_element_set_state (pipeline, GST_STATE_PLAYING) != GST_STATE_SUCCESS) { if (gst_element_set_state (pipeline,
GST_STATE_PLAYING) != GST_STATE_CHANGE_SUCCESS) {
g_print ("pipeline doesn't want to play\n"); g_print ("pipeline doesn't want to play\n");
return -1; return -1;
} }

27
ext/aalib/gstaasink.c
View file

@ -81,7 +81,8 @@ static void gst_aasink_set_property (GObject * object, guint prop_id,
static void gst_aasink_get_property (GObject * object, guint prop_id, static void gst_aasink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_aasink_change_state (GstElement * element); static GstStateChangeReturn gst_aasink_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
static guint gst_aasink_signals[LAST_SIGNAL] = { 0 }; static guint gst_aasink_signals[LAST_SIGNAL] = { 0 };
@ -492,35 +493,33 @@ gst_aasink_close (GstAASink * aasink)
return TRUE; return TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_aasink_change_state (GstElement * element) gst_aasink_change_state (GstElement * element, GstStateChange transition)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
gint transition;
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!gst_aasink_open (GST_AASINK (element))) if (!gst_aasink_open (GST_AASINK (element)))
goto open_failed; goto open_failed;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
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:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_aasink_close (GST_AASINK (element)); gst_aasink_close (GST_AASINK (element));
break; break;
default: default:
@ -531,7 +530,7 @@ gst_aasink_change_state (GstElement * element)
open_failed: open_failed:
{ {
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }

19
ext/cairo/gsttextoverlay.c
View file

@ -77,8 +77,7 @@ static void gst_textoverlay_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec); guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_textoverlay_get_property (GObject * object, static void gst_textoverlay_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_textoverlay_change_state (GstElement * static GstStateChangeReturn gst_textoverlay_change_state (GstElement * element);
element);
static void gst_textoverlay_finalize (GObject * object); static void gst_textoverlay_finalize (GObject * object);
@ -550,25 +549,25 @@ gst_textoverlay_font_init (GstTextOverlay * overlay)
overlay->need_render = TRUE; overlay->need_render = TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_textoverlay_change_state (GstElement * element) gst_textoverlay_change_state (GstElement * element, GstStateChange transition)
{ {
GstTextOverlay *overlay; GstTextOverlay *overlay;
overlay = GST_TEXTOVERLAY (element); overlay = GST_TEXTOVERLAY (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
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:
break; break;
} }
parent_class->change_state (element); parent_class->change_state (element, transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static void static void

25
ext/dv/gstdvdec.c
View file

@ -115,7 +115,8 @@ GST_BOILERPLATE (GstDVDec, gst_dvdec, GstElement, GST_TYPE_ELEMENT);
static gboolean gst_dvdec_sink_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_dvdec_sink_setcaps (GstPad * pad, GstCaps * caps);
static GstFlowReturn gst_dvdec_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_dvdec_chain (GstPad * pad, GstBuffer * buffer);
static GstElementStateReturn gst_dvdec_change_state (GstElement * element); static GstStateChangeReturn gst_dvdec_change_state (GstElement * element,
GstStateChange transition);
static void gst_dvdec_set_property (GObject * object, guint prop_id, static void gst_dvdec_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
@ -309,19 +310,17 @@ no_buffer:
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_dvdec_change_state (GstElement * element) gst_dvdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstDVDec *dvdec = GST_DVDEC (element); GstDVDec *dvdec = GST_DVDEC (element);
GstElementStateReturn ret; GstStateChangeReturn ret;
gint transition;
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
dvdec->decoder = dvdec->decoder =
dv_decoder_new (0, dvdec->clamp_luma, dvdec->clamp_chroma); dv_decoder_new (0, dvdec->clamp_luma, dvdec->clamp_chroma);
dvdec->decoder->quality = qualities[dvdec->quality]; dvdec->decoder->quality = qualities[dvdec->quality];
@ -331,23 +330,23 @@ gst_dvdec_change_state (GstElement * element)
*/ */
/* dv_set_quality (dvdec->decoder, qualities [dvdec->quality]); */ /* dv_set_quality (dvdec->decoder, qualities [dvdec->quality]); */
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
default: default:
break; break;
} }
ret = parent_class->change_state (element); ret = parent_class->change_state (element, transition);
switch (transition) { switch (transition) {
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:
dv_decoder_free (dvdec->decoder); dv_decoder_free (dvdec->decoder);
dvdec->decoder = NULL; dvdec->decoder = NULL;
dvdec->headers_seen = FALSE; dvdec->headers_seen = FALSE;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

25
ext/dv/gstdvdemux.c
View file

@ -130,7 +130,8 @@ static GstFlowReturn gst_dvdemux_flush (GstDVDemux * dvdemux);
static GstFlowReturn gst_dvdemux_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_dvdemux_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_dvdemux_handle_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_dvdemux_handle_sink_event (GstPad * pad, GstEvent * event);
static GstElementStateReturn gst_dvdemux_change_state (GstElement * element); static GstStateChangeReturn gst_dvdemux_change_state (GstElement * element,
GstStateChange transition);
static void static void
@ -955,21 +956,19 @@ gst_dvdemux_chain (GstPad * pad, GstBuffer * buffer)
return ret; return ret;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_dvdemux_change_state (GstElement * element) gst_dvdemux_change_state (GstElement * element, GstStateChange transition)
{ {
GstDVDemux *dvdemux = GST_DVDEMUX (element); GstDVDemux *dvdemux = GST_DVDEMUX (element);
GstElementStateReturn ret; GstStateChangeReturn ret;
gint transition;
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!dvdemux->videosrcpad) if (!dvdemux->videosrcpad)
gst_dvdemux_add_pads (dvdemux); gst_dvdemux_add_pads (dvdemux);
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
dvdemux->decoder = dv_decoder_new (0, FALSE, FALSE); dvdemux->decoder = dv_decoder_new (0, FALSE, FALSE);
dvdemux->audio_offset = 0; dvdemux->audio_offset = 0;
dvdemux->video_offset = 0; dvdemux->video_offset = 0;
@ -977,23 +976,23 @@ gst_dvdemux_change_state (GstElement * element)
dvdemux->found_header = FALSE; dvdemux->found_header = FALSE;
dvdemux->frame_len = -1; dvdemux->frame_len = -1;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
default: default:
break; break;
} }
ret = parent_class->change_state (element); ret = parent_class->change_state (element, transition);
switch (transition) { switch (transition) {
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:
gst_adapter_clear (dvdemux->adapter); gst_adapter_clear (dvdemux->adapter);
dv_decoder_free (dvdemux->decoder); dv_decoder_free (dvdemux->decoder);
dvdemux->decoder = NULL; dvdemux->decoder = NULL;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

13
ext/esd/esdmon.c
View file

@ -76,7 +76,8 @@ static void gst_esdmon_init (GTypeInstance * instance, gpointer g_class);
static gboolean gst_esdmon_open_audio (GstEsdmon * src); static gboolean gst_esdmon_open_audio (GstEsdmon * src);
static void gst_esdmon_close_audio (GstEsdmon * src); static void gst_esdmon_close_audio (GstEsdmon * src);
static GstElementStateReturn gst_esdmon_change_state (GstElement * element); static GstStateChangeReturn gst_esdmon_change_state (GstElement * element,
GstStateChange transition);
static gboolean gst_esdmon_sync_parms (GstEsdmon * esdmon); static gboolean gst_esdmon_sync_parms (GstEsdmon * esdmon);
static GstData *gst_esdmon_get (GstPad * pad); static GstData *gst_esdmon_get (GstPad * pad);
@ -422,8 +423,8 @@ gst_esdmon_close_audio (GstEsdmon * src)
GST_DEBUG ("esdmon: closed sound device"); GST_DEBUG ("esdmon: closed sound device");
} }
static GstElementStateReturn static GstStateChangeReturn
gst_esdmon_change_state (GstElement * element) gst_esdmon_change_state (GstElement * element, GstStateChange transition)
{ {
g_return_val_if_fail (GST_IS_ESDMON (element), FALSE); g_return_val_if_fail (GST_IS_ESDMON (element), FALSE);
@ -435,11 +436,11 @@ gst_esdmon_change_state (GstElement * element)
} else { } else {
if (!GST_FLAG_IS_SET (element, GST_ESDMON_OPEN)) { if (!GST_FLAG_IS_SET (element, GST_ESDMON_OPEN)) {
if (!gst_esdmon_open_audio (GST_ESDMON (element))) if (!gst_esdmon_open_audio (GST_ESDMON (element)))
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }
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;
} }

17
ext/flac/gstflacdec.c
View file

@ -48,7 +48,8 @@ static void gst_flacdec_init (FlacDec * flacdec);
static void gst_flacdec_finalize (GObject * object); static void gst_flacdec_finalize (GObject * object);
static void gst_flacdec_loop (GstPad * pad); static void gst_flacdec_loop (GstPad * pad);
static GstElementStateReturn gst_flacdec_change_state (GstElement * element); static GstStateChangeReturn gst_flacdec_change_state (GstElement * element,
GstStateChange transition);
static const GstQueryType *gst_flacdec_get_src_query_types (GstPad * pad); static const GstQueryType *gst_flacdec_get_src_query_types (GstPad * pad);
static gboolean gst_flacdec_src_query (GstPad * pad, GstQuery * query); static gboolean gst_flacdec_src_query (GstPad * pad, GstQuery * query);
static gboolean gst_flacdec_convert_src (GstPad * pad, GstFormat src_format, static gboolean gst_flacdec_convert_src (GstPad * pad, GstFormat src_format,
@ -766,13 +767,13 @@ gst_flacdec_sink_activate_pull (GstPad * sinkpad, gboolean active)
return TRUE; return TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_flacdec_change_state (GstElement * element) gst_flacdec_change_state (GstElement * element, GstStateChange transition)
{ {
FlacDec *flacdec = GST_FLACDEC (element); FlacDec *flacdec = GST_FLACDEC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
flacdec->seek_pending = FALSE; flacdec->seek_pending = FALSE;
flacdec->total_samples = 0; flacdec->total_samples = 0;
flacdec->eos = FALSE; flacdec->eos = FALSE;
@ -781,7 +782,7 @@ gst_flacdec_change_state (GstElement * element)
FLAC__seekable_stream_decoder_reset (flacdec->decoder); FLAC__seekable_stream_decoder_reset (flacdec->decoder);
} }
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
flacdec->eos = FALSE; flacdec->eos = FALSE;
break; break;
default: default:
@ -789,7 +790,7 @@ gst_flacdec_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;
} }

25
ext/flac/gstflacenc.c
View file

@ -78,7 +78,8 @@ static void gst_flacenc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_flacenc_get_property (GObject * object, guint prop_id, static void gst_flacenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_flacenc_change_state (GstElement * element); static GstStateChangeReturn gst_flacenc_change_state (GstElement * element,
GstStateChange transition);
static FLAC__StreamEncoderWriteStatus static FLAC__StreamEncoderWriteStatus
gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder, gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder,
@ -778,21 +779,21 @@ gst_flacenc_get_property (GObject * object, guint prop_id,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_flacenc_change_state (GstElement * element) gst_flacenc_change_state (GstElement * element, GstStateChange transition)
{ {
FlacEnc *flacenc = GST_FLACENC (element); FlacEnc *flacenc = GST_FLACENC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
flacenc->first = TRUE; flacenc->first = TRUE;
flacenc->stopped = FALSE; flacenc->stopped = FALSE;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
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:
if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) !=
FLAC__STREAM_ENCODER_UNINITIALIZED) { FLAC__STREAM_ENCODER_UNINITIALIZED) {
flacenc->stopped = TRUE; flacenc->stopped = TRUE;
@ -811,13 +812,13 @@ gst_flacenc_change_state (GstElement * element)
flacenc->meta = NULL; flacenc->meta = NULL;
} }
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
default: default:
break; break;
} }
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;
} }

23
ext/flac/gstflactag.c
View file

@ -127,7 +127,8 @@ static void gst_flac_tag_init (GstFlacTag * tag);
static void gst_flac_tag_chain (GstPad * pad, GstData * data); static void gst_flac_tag_chain (GstPad * pad, GstData * data);
static GstElementStateReturn gst_flac_tag_change_state (GstElement * element); static GstStateChangeReturn gst_flac_tag_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -553,24 +554,24 @@ gst_flac_tag_chain (GstPad * pad, GstData * data)
} }
static GstElementStateReturn static GstStateChangeReturn
gst_flac_tag_change_state (GstElement * element) gst_flac_tag_change_state (GstElement * element, GstStateChange transition)
{ {
GstFlacTag *tag; GstFlacTag *tag;
tag = GST_FLAC_TAG (element); tag = GST_FLAC_TAG (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
/* do something to get out of the chain function faster */ /* do something to get out of the chain function faster */
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:
if (tag->buffer) { if (tag->buffer) {
gst_buffer_unref (tag->buffer); gst_buffer_unref (tag->buffer);
tag->buffer = NULL; tag->buffer = NULL;
@ -584,9 +585,9 @@ gst_flac_tag_change_state (GstElement * element)
} }
tag->state = GST_FLAC_TAG_STATE_INIT; tag->state = GST_FLAC_TAG_STATE_INIT;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
} }
return parent_class->change_state (element); return parent_class->change_state (element, transition);
} }

20
ext/gconf/gstgconfaudiosink.c
View file

@ -27,8 +27,9 @@
static void gst_gconf_audio_sink_dispose (GObject * object); static void gst_gconf_audio_sink_dispose (GObject * object);
static void cb_toggle_element (GConfClient * client, static void cb_toggle_element (GConfClient * client,
guint connection_id, GConfEntry * entry, gpointer data); guint connection_id, GConfEntry * entry, gpointer data);
static GstElementStateReturn static GstStateChangeReturn
gst_gconf_audio_sink_change_state (GstElement * element); gst_gconf_audio_sink_change_state (GstElement * element,
GstStateChange transition);
GST_BOILERPLATE (GstGConfAudioSink, gst_gconf_audio_sink, GstBin, GST_TYPE_BIN); GST_BOILERPLATE (GstGConfAudioSink, gst_gconf_audio_sink, GstBin, GST_TYPE_BIN);
@ -150,17 +151,18 @@ cb_toggle_element (GConfClient * client,
do_toggle_element (GST_GCONF_AUDIO_SINK (data)); do_toggle_element (GST_GCONF_AUDIO_SINK (data));
} }
static GstElementStateReturn static GstStateChangeReturn
gst_gconf_audio_sink_change_state (GstElement * element) gst_gconf_audio_sink_change_state (GstElement * element,
GstStateChange transition)
{ {
GstGConfAudioSink *sink = GST_GCONF_AUDIO_SINK (element); GstGConfAudioSink *sink = GST_GCONF_AUDIO_SINK (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!do_toggle_element (sink)) if (!do_toggle_element (sink))
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_gconf_audio_sink_reset (sink); gst_gconf_audio_sink_reset (sink);
break; break;
default: default:
@ -168,5 +170,5 @@ gst_gconf_audio_sink_change_state (GstElement * element)
} }
return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state, return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
(element), GST_STATE_SUCCESS); (element, transition), GST_STATE_CHANGE_SUCCESS);
} }

20
ext/gconf/gstgconfvideosink.c
View file

@ -27,8 +27,9 @@
static void gst_gconf_video_sink_dispose (GObject * object); static void gst_gconf_video_sink_dispose (GObject * object);
static void cb_toggle_element (GConfClient * client, static void cb_toggle_element (GConfClient * client,
guint connection_id, GConfEntry * entry, gpointer data); guint connection_id, GConfEntry * entry, gpointer data);
static GstElementStateReturn static GstStateChangeReturn
gst_gconf_video_sink_change_state (GstElement * element); gst_gconf_video_sink_change_state (GstElement * element,
GstStateChange transition);
GST_BOILERPLATE (GstGConfVideoSink, gst_gconf_video_sink, GstBin, GST_TYPE_BIN); GST_BOILERPLATE (GstGConfVideoSink, gst_gconf_video_sink, GstBin, GST_TYPE_BIN);
@ -150,17 +151,18 @@ cb_toggle_element (GConfClient * client,
do_toggle_element (GST_GCONF_VIDEO_SINK (data)); do_toggle_element (GST_GCONF_VIDEO_SINK (data));
} }
static GstElementStateReturn static GstStateChangeReturn
gst_gconf_video_sink_change_state (GstElement * element) gst_gconf_video_sink_change_state (GstElement * element,
GstStateChange transition)
{ {
GstGConfVideoSink *sink = GST_GCONF_VIDEO_SINK (element); GstGConfVideoSink *sink = GST_GCONF_VIDEO_SINK (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!do_toggle_element (sink)) if (!do_toggle_element (sink))
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_gconf_video_sink_reset (sink); gst_gconf_video_sink_reset (sink);
break; break;
default: default:
@ -168,5 +170,5 @@ gst_gconf_video_sink_change_state (GstElement * element)
} }
return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state, return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
(element), GST_STATE_SUCCESS); (element, transition), GST_STATE_CHANGE_SUCCESS);
} }

2
ext/gdk_pixbuf/gstgdkanimation.c
View file

@ -323,7 +323,7 @@ gst_gdk_animation_iter_create_pipeline (GstGdkAnimationIter * iter)
if (!gst_element_link_filtered (colorspace, sink, caps)) if (!gst_element_link_filtered (colorspace, sink, caps))
goto error; goto error;
if (gst_element_set_state (iter->pipeline, if (gst_element_set_state (iter->pipeline,
GST_STATE_PLAYING) != GST_STATE_SUCCESS) GST_STATE_PLAYING) != GST_STATE_CHANGE_SUCCESS)
goto error; goto error;
return TRUE; return TRUE;

19
ext/jpeg/gstjpegdec.c
View file

@ -80,7 +80,8 @@ static void gst_jpeg_dec_init (GstJpegDec * jpegdec);
static GstFlowReturn gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_jpeg_dec_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_jpeg_dec_setcaps (GstPad * pad, GstCaps * caps);
static GstElementStateReturn gst_jpeg_dec_change_state (GstElement * element); static GstStateChangeReturn gst_jpeg_dec_change_state (GstElement * element,
GstStateChange transition);
GType GType
gst_jpeg_dec_get_type (void) gst_jpeg_dec_get_type (void)
@ -882,16 +883,16 @@ done:
return ret; return ret;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_jpeg_dec_change_state (GstElement * element) gst_jpeg_dec_change_state (GstElement * element, GstStateChange transition)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
GstJpegDec *dec; GstJpegDec *dec;
dec = GST_JPEG_DEC (element); dec = GST_JPEG_DEC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
dec->next_ts = 0; dec->next_ts = 0;
dec->packetized = FALSE; dec->packetized = FALSE;
break; break;
@ -899,10 +900,10 @@ gst_jpeg_dec_change_state (GstElement * element)
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
if (dec->tempbuf) { if (dec->tempbuf) {
gst_buffer_unref (dec->tempbuf); gst_buffer_unref (dec->tempbuf);
dec->tempbuf = NULL; dec->tempbuf = NULL;

17
ext/jpeg/gstjpegenc.c
View file

@ -86,7 +86,8 @@ static void gst_jpegenc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_jpegenc_get_property (GObject * object, guint prop_id, static void gst_jpegenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_jpegenc_change_state (GstElement * element); static GstStateChangeReturn gst_jpegenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -503,21 +504,21 @@ gst_jpegenc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_jpegenc_change_state (GstElement * element) gst_jpegenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstJpegEnc *filter = GST_JPEGENC (element); GstJpegEnc *filter = GST_JPEGENC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
GST_DEBUG ("gst_jpegenc_change_state: setting line buffers"); GST_DEBUG ("gst_jpegenc_change_state: setting line buffers");
filter->line[0] = NULL; filter->line[0] = NULL;
filter->line[1] = NULL; filter->line[1] = NULL;
filter->line[2] = NULL; filter->line[2] = NULL;
gst_jpegenc_resync (filter); gst_jpegenc_resync (filter);
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
g_free (filter->line[0]); g_free (filter->line[0]);
g_free (filter->line[1]); g_free (filter->line[1]);
g_free (filter->line[2]); g_free (filter->line[2]);
@ -530,7 +531,7 @@ gst_jpegenc_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;
} }

25
ext/ladspa/gstsignalprocessor.c
View file

@ -143,7 +143,7 @@ static gboolean gst_signal_processor_src_activate_pull (GstPad * pad,
gboolean active); gboolean active);
static gboolean gst_signal_processor_sink_activate_push (GstPad * pad, static gboolean gst_signal_processor_sink_activate_push (GstPad * pad,
gboolean active); gboolean active);
static GstElementStateReturn gst_signal_processor_change_state (GstElement * static GstStateChangeReturn gst_signal_processor_change_state (GstElement *
element); element);
static gboolean gst_signal_processor_event (GstPad * pad, GstEvent * event); static gboolean gst_signal_processor_event (GstPad * pad, GstEvent * event);
@ -667,38 +667,37 @@ gst_signal_processor_src_activate_pull (GstPad * pad, gboolean active)
return result; return result;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_signal_processor_change_state (GstElement * element) gst_signal_processor_change_state (GstElement * element,
GstStateChange transition)
{ {
/* GstSignalProcessor *self; /* GstSignalProcessor *self;
GstSignalProcessorClass *klass; */ GstSignalProcessorClass *klass; */
GstElementState transition; GstStateChangeReturn result;
GstElementStateReturn result;
/* self = GST_SIGNAL_PROCESSOR (element); /* self = GST_SIGNAL_PROCESSOR (element);
klass = GST_SIGNAL_PROCESSOR_GET_CLASS (self); */ klass = GST_SIGNAL_PROCESSOR_GET_CLASS (self); */
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
default: default:
break; break;
} }
result = GST_ELEMENT_CLASS (parent_class)->change_state (element); result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
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:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
/* gst_signal_processor_cleanup (self); */ /* gst_signal_processor_cleanup (self); */
break; break;
default: default:

19
ext/libcaca/gstcacasink.c
View file

@ -72,7 +72,8 @@ static void gst_cacasink_set_property (GObject * object, guint prop_id,
static void gst_cacasink_get_property (GObject * object, guint prop_id, static void gst_cacasink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_cacasink_change_state (GstElement * element); static GstStateChangeReturn gst_cacasink_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -356,27 +357,25 @@ gst_cacasink_close (GstCACASink * cacasink)
caca_end (); caca_end ();
} }
static GstElementStateReturn static GstStateChangeReturn
gst_cacasink_change_state (GstElement * element) gst_cacasink_change_state (GstElement * element, GstStateChange transition)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
gint transition;
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!gst_cacasink_open (GST_CACASINK (element))) if (!gst_cacasink_open (GST_CACASINK (element)))
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_cacasink_close (GST_CACASINK (element)); gst_cacasink_close (GST_CACASINK (element));
break; break;
default: default:

27
ext/libmng/gstmngdec.c
View file

@ -50,7 +50,8 @@ static void gst_mngdec_get_property (GObject * object,
static void gst_mngdec_set_property (GObject * object, static void gst_mngdec_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec); guint prop_id, const GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_mngdec_change_state (GstElement * element); static GstStateChangeReturn gst_mngdec_change_state (GstElement * element,
GstStateChange transition);
static void gst_mngdec_loop (GstElement * element); static void gst_mngdec_loop (GstElement * element);
@ -486,20 +487,20 @@ mngdec_refresh (mng_handle mng, mng_uint32 x, mng_uint32 y,
return MNG_TRUE; return MNG_TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_mngdec_change_state (GstElement * element) gst_mngdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstMngDec *mngdec = GST_MNGDEC (element); GstMngDec *mngdec = GST_MNGDEC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
/* init library, make sure to pass an alloc function that sets the /* init library, make sure to pass an alloc function that sets the
* memory to 0 */ * memory to 0 */
mngdec->mng = mngdec->mng =
mng_initialize (mngdec, (mng_memalloc) g_malloc0, mng_initialize (mngdec, (mng_memalloc) g_malloc0,
(mng_memfree) g_free, MNG_NULL); (mng_memfree) g_free, MNG_NULL);
if (mngdec->mng == MNG_NULL) { if (mngdec->mng == MNG_NULL) {
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
/* set the callbacks */ /* set the callbacks */
mng_setcb_errorproc (mngdec->mng, mngdec_error); mng_setcb_errorproc (mngdec->mng, mngdec_error);
@ -514,16 +515,16 @@ gst_mngdec_change_state (GstElement * element)
mng_set_canvasstyle (mngdec->mng, MNG_CANVAS_RGBA8); mng_set_canvasstyle (mngdec->mng, MNG_CANVAS_RGBA8);
mng_set_doprogressive (mngdec->mng, MNG_FALSE); mng_set_doprogressive (mngdec->mng, MNG_FALSE);
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
mngdec->first = TRUE; mngdec->first = TRUE;
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:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
mng_cleanup (&mngdec->mng); mng_cleanup (&mngdec->mng);
break; break;
default: default:
@ -531,7 +532,7 @@ gst_mngdec_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;
} }

13
ext/mikmod/gstmikmod.c
View file

@ -101,7 +101,8 @@ static GstPadLinkReturn gst_mikmod_srclink (GstPad * pad, const GstCaps * caps);
static GstCaps *gst_mikmod_srcfixate (GstPad * pad, const GstCaps * caps); static GstCaps *gst_mikmod_srcfixate (GstPad * pad, const GstCaps * caps);
static void gst_mikmod_loop (GstElement * element); static void gst_mikmod_loop (GstElement * element);
static gboolean gst_mikmod_setup (GstMikMod * mikmod); static gboolean gst_mikmod_setup (GstMikMod * mikmod);
static GstElementStateReturn gst_mikmod_change_state (GstElement * element); static GstStateChangeReturn gst_mikmod_change_state (GstElement * element,
GstStateChange transition);
@ -388,12 +389,12 @@ gst_mikmod_setup (GstMikMod * mikmod)
} }
static GstElementStateReturn static GstStateChangeReturn
gst_mikmod_change_state (GstElement * element) gst_mikmod_change_state (GstElement * element, GstStateChange transition)
{ {
GstMikMod *mikmod; GstMikMod *mikmod;
g_return_val_if_fail (GST_IS_MIKMOD (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_MIKMOD (element), GST_STATE_CHANGE_FAILURE);
mikmod = GST_MIKMOD (element); mikmod = GST_MIKMOD (element);
@ -426,9 +427,9 @@ gst_mikmod_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;
} }

19
ext/pango/gsttextoverlay.c
View file

@ -78,8 +78,7 @@ static void gst_textoverlay_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec); guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_textoverlay_get_property (GObject * object, static void gst_textoverlay_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_textoverlay_change_state (GstElement * static GstStateChangeReturn gst_textoverlay_change_state (GstElement * element);
element);
static void gst_textoverlay_finalize (GObject * object); static void gst_textoverlay_finalize (GObject * object);
@ -606,25 +605,25 @@ gst_textoverlay_loop (GstElement * element)
} }
static GstElementStateReturn static GstStateChangeReturn
gst_textoverlay_change_state (GstElement * element) gst_textoverlay_change_state (GstElement * element, GstStateChange transition)
{ {
GstTextOverlay *overlay; GstTextOverlay *overlay;
overlay = GST_TEXTOVERLAY (element); overlay = GST_TEXTOVERLAY (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
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:
break; break;
} }
parent_class->change_state (element); parent_class->change_state (element, transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static void static void

31
ext/raw1394/gstdv1394src.c
View file

@ -92,7 +92,8 @@ static void gst_dv1394src_set_property (GObject * object, guint prop_id,
static void gst_dv1394src_get_property (GObject * object, guint prop_id, static void gst_dv1394src_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_dv1394src_change_state (GstElement * element); static GstStateChangeReturn gst_dv1394src_change_state (GstElement * element,
GstStateChange transition);
static GstFlowReturn gst_dv1394src_create (GstPushSrc * psrc, GstBuffer ** buf); static GstFlowReturn gst_dv1394src_create (GstPushSrc * psrc, GstBuffer ** buf);
@ -557,18 +558,16 @@ gst_dv1394src_discover_avc_node (GstDV1394Src * src)
return node; return node;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_dv1394src_change_state (GstElement * element) gst_dv1394src_change_state (GstElement * element, GstStateChange transition)
{ {
GstDV1394Src *dv1394src; GstDV1394Src *dv1394src;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
dv1394src = GST_DV1394SRC (element); dv1394src = GST_DV1394SRC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
/* create a handle */ /* create a handle */
if ((dv1394src->handle = raw1394_new_handle ()) == NULL) if ((dv1394src->handle = raw1394_new_handle ()) == NULL)
goto no_handle; goto no_handle;
@ -599,7 +598,7 @@ gst_dv1394src_change_state (GstElement * element)
GST_DEBUG_OBJECT (dv1394src, "successfully opened up 1394 connection"); GST_DEBUG_OBJECT (dv1394src, "successfully opened up 1394 connection");
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
if (raw1394_start_iso_rcv (dv1394src->handle, dv1394src->channel) < 0) if (raw1394_start_iso_rcv (dv1394src->handle, dv1394src->channel) < 0)
goto cannot_start; goto cannot_start;
@ -617,10 +616,10 @@ gst_dv1394src_change_state (GstElement * element)
} }
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
/* we need to lock here as the _create function has to be completed. /* we need to lock here as the _create function has to be completed.
* The base source will not call the _create() function again. */ * The base source will not call the _create() function again. */
GST_DV_LOCK (dv1394src); GST_DV_LOCK (dv1394src);
@ -635,10 +634,10 @@ gst_dv1394src_change_state (GstElement * element)
} }
GST_DV_UNLOCK (dv1394src); GST_DV_UNLOCK (dv1394src);
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
dv1394src->negotiated = FALSE; dv1394src->negotiated = FALSE;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (dv1394src->use_avc) { if (dv1394src->use_avc) {
/* stop the VCR */ /* stop the VCR */
avc1394_vcr_stop (dv1394src->handle, dv1394src->avc_node); avc1394_vcr_stop (dv1394src->handle, dv1394src->avc_node);
@ -655,25 +654,25 @@ no_handle:
{ {
GST_ELEMENT_ERROR (dv1394src, RESOURCE, NOT_FOUND, (NULL), GST_ELEMENT_ERROR (dv1394src, RESOURCE, NOT_FOUND, (NULL),
("can't get raw1394 handle")); ("can't get raw1394 handle"));
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
no_ports: no_ports:
{ {
GST_ELEMENT_ERROR (dv1394src, RESOURCE, NOT_FOUND, (NULL), GST_ELEMENT_ERROR (dv1394src, RESOURCE, NOT_FOUND, (NULL),
("no ports available for raw1394")); ("no ports available for raw1394"));
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
cannot_set_port: cannot_set_port:
{ {
GST_ELEMENT_ERROR (dv1394src, RESOURCE, SETTINGS, (NULL), GST_ELEMENT_ERROR (dv1394src, RESOURCE, SETTINGS, (NULL),
("can't set 1394 port %d", dv1394src->port)); ("can't set 1394 port %d", dv1394src->port));
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
cannot_start: cannot_start:
{ {
GST_ELEMENT_ERROR (dv1394src, RESOURCE, READ, (NULL), GST_ELEMENT_ERROR (dv1394src, RESOURCE, READ, (NULL),
("can't start 1394 iso receive")); ("can't start 1394 iso receive"));
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }

31
ext/shout2/gstshout2.c
View file

@ -84,7 +84,8 @@ static void gst_shout2send_set_property (GObject * object, guint prop_id,
static void gst_shout2send_get_property (GObject * object, guint prop_id, static void gst_shout2send_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_shout2send_change_state (GstElement * element); static GstStateChangeReturn gst_shout2send_change_state (GstElement * element,
GstStateChange transition);
static gboolean gst_shout2send_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_shout2send_setcaps (GstPad * pad, GstCaps * caps);
static guint gst_shout2send_signals[LAST_SIGNAL] = { 0 }; static guint gst_shout2send_signals[LAST_SIGNAL] = { 0 };
@ -529,26 +530,26 @@ gst_shout2send_setcaps (GstPad * pad, GstCaps * caps)
} }
static GstElementStateReturn static GstStateChangeReturn
gst_shout2send_change_state (GstElement * element) gst_shout2send_change_state (GstElement * element, GstStateChange transition)
{ {
GstShout2send *shout2send; GstShout2send *shout2send;
GstElementStateReturn ret; GstStateChangeReturn ret;
guint major, minor, micro; guint major, minor, micro;
gshort proto = 3; gshort proto = 3;
gchar *version_string; gchar *version_string;
g_return_val_if_fail (GST_IS_SHOUT2SEND (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_SHOUT2SEND (element), GST_STATE_CHANGE_FAILURE);
shout2send = GST_SHOUT2SEND (element); shout2send = GST_SHOUT2SEND (element);
GST_DEBUG ("state pending %d", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d", GST_STATE_PENDING (element));
/* if going down into NULL state, close the file if it's open */ /* if going down into NULL state, close the file if it's open */
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
shout2send->conn = shout_new (); shout2send->conn = shout_new ();
switch (shout2send->protocol) { switch (shout2send->protocol) {
@ -637,9 +638,9 @@ gst_shout2send_change_state (GstElement * element)
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
/* connect */ /* connect */
GST_DEBUG ("Connection format is: %s", GST_DEBUG ("Connection format is: %s",
@ -660,7 +661,7 @@ gst_shout2send_change_state (GstElement * element)
GST_ERROR ("Couldn't connect to server: %s", GST_ERROR ("Couldn't connect to server: %s",
shout_get_error (shout2send->conn)); shout_get_error (shout2send->conn));
shout2send->conn = FALSE; shout2send->conn = FALSE;
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
break; break;
@ -669,17 +670,17 @@ gst_shout2send_change_state (GstElement * element)
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
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:
shout_close (shout2send->conn); shout_close (shout2send->conn);
shout_free (shout2send->conn); shout_free (shout2send->conn);
shout2send->started = FALSE; shout2send->started = FALSE;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

23
ext/speex/gstspeexdec.c
View file

@ -65,7 +65,8 @@ GST_BOILERPLATE (GstSpeexDec, gst_speex_dec, GstElement, GST_TYPE_ELEMENT);
static gboolean speex_dec_event (GstPad * pad, GstEvent * event); static gboolean speex_dec_event (GstPad * pad, GstEvent * event);
static GstFlowReturn speex_dec_chain (GstPad * pad, GstBuffer * buf); static GstFlowReturn speex_dec_chain (GstPad * pad, GstBuffer * buf);
static GstElementStateReturn speex_dec_change_state (GstElement * element); static GstStateChangeReturn speex_dec_change_state (GstElement * element,
GstStateChange transition);
static gboolean speex_dec_src_event (GstPad * pad, GstEvent * event); static gboolean speex_dec_src_event (GstPad * pad, GstEvent * event);
static gboolean speex_dec_src_query (GstPad * pad, GstQuery * query); static gboolean speex_dec_src_query (GstPad * pad, GstQuery * query);
@ -530,29 +531,29 @@ gst_speexdec_set_property (GObject * object, guint prop_id,
} }
static GstElementStateReturn static GstStateChangeReturn
speex_dec_change_state (GstElement * element) speex_dec_change_state (GstElement * element, GstStateChange transition)
{ {
GstSpeexDec *vd = GST_SPEEXDEC (element); GstSpeexDec *vd = GST_SPEEXDEC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
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:
vd->packetno = 0; vd->packetno = 0;
vd->samples_out = 0; vd->samples_out = 0;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;
} }
return parent_class->change_state (element); return parent_class->change_state (element, transition);
} }

25
ext/speex/gstspeexenc.c
View file

@ -104,7 +104,8 @@ static void gst_speexenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static void gst_speexenc_set_property (GObject * object, guint prop_id, static void gst_speexenc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_speexenc_change_state (GstElement * element); static GstStateChangeReturn gst_speexenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -1057,35 +1058,35 @@ gst_speexenc_set_property (GObject * object, guint prop_id,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_speexenc_change_state (GstElement * element) gst_speexenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstSpeexEnc *speexenc = GST_SPEEXENC (element); GstSpeexEnc *speexenc = GST_SPEEXENC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
speexenc->eos = FALSE; speexenc->eos = FALSE;
speexenc->frameno = 0; speexenc->frameno = 0;
speexenc->samples_in = 0; speexenc->samples_in = 0;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
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:
speexenc->setup = FALSE; speexenc->setup = FALSE;
speexenc->header_sent = FALSE; speexenc->header_sent = FALSE;
gst_tag_list_free (speexenc->tags); gst_tag_list_free (speexenc->tags);
speexenc->tags = gst_tag_list_new (); speexenc->tags = gst_tag_list_new ();
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
default: default:
break; break;
} }
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;
} }

25
gst/alpha/gstalpha.c
View file

@ -159,7 +159,8 @@ static void gst_alpha_get_property (GObject * object, guint prop_id,
static gboolean gst_alpha_sink_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_alpha_sink_setcaps (GstPad * pad, GstCaps * caps);
static GstFlowReturn gst_alpha_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_alpha_chain (GstPad * pad, GstBuffer * buffer);
static GstElementStateReturn gst_alpha_change_state (GstElement * element); static GstStateChangeReturn gst_alpha_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -853,32 +854,32 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer)
return ret; return ret;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_alpha_change_state (GstElement * element) gst_alpha_change_state (GstElement * element, GstStateChange transition)
{ {
GstAlpha *alpha; GstAlpha *alpha;
alpha = GST_ALPHA (element); alpha = GST_ALPHA (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_alpha_init_params (alpha); gst_alpha_init_params (alpha);
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:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
} }
parent_class->change_state (element); parent_class->change_state (element, transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static gboolean static gboolean

15
gst/auparse/gstauparse.c
View file

@ -86,7 +86,8 @@ static void gst_auparse_init (GstAuParse * auparse);
static void gst_auparse_chain (GstPad * pad, GstData * _data); static void gst_auparse_chain (GstPad * pad, GstData * _data);
static GstElementStateReturn gst_auparse_change_state (GstElement * element); static GstStateChangeReturn gst_auparse_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -376,13 +377,13 @@ Samples :
gst_pad_push (auparse->srcpad, GST_DATA (buf)); gst_pad_push (auparse->srcpad, GST_DATA (buf));
} }
static GstElementStateReturn static GstStateChangeReturn
gst_auparse_change_state (GstElement * element) gst_auparse_change_state (GstElement * element, GstStateChange transition)
{ {
GstAuParse *auparse = GST_AUPARSE (element); GstAuParse *auparse = GST_AUPARSE (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
if (auparse->srcpad) { if (auparse->srcpad) {
gst_element_remove_pad (element, auparse->srcpad); gst_element_remove_pad (element, auparse->srcpad);
auparse->srcpad = NULL; auparse->srcpad = NULL;
@ -393,9 +394,9 @@ gst_auparse_change_state (GstElement * element)
} }
if (parent_class->change_state) if (parent_class->change_state)
return parent_class->change_state (element); return parent_class->change_state (element, transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static gboolean static gboolean

26
gst/autodetect/gstautoaudiosink.c
View file

@ -26,8 +26,9 @@
#include "gstautoaudiosink.h" #include "gstautoaudiosink.h"
#include "gstautodetect.h" #include "gstautodetect.h"
static GstElementStateReturn static GstStateChangeReturn
gst_auto_audio_sink_change_state (GstElement * element); gst_auto_audio_sink_change_state (GstElement * element,
GstStateChange transition);
GST_BOILERPLATE (GstAutoAudioSink, gst_auto_audio_sink, GstBin, GST_TYPE_BIN); GST_BOILERPLATE (GstAutoAudioSink, gst_auto_audio_sink, GstBin, GST_TYPE_BIN);
@ -170,7 +171,8 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink)
} }
} }
GST_LOG ("Testing %s", GST_PLUGIN_FEATURE (f)->name); GST_LOG ("Testing %s", GST_PLUGIN_FEATURE (f)->name);
if (gst_element_set_state (el, GST_STATE_READY) == GST_STATE_SUCCESS) { if (gst_element_set_state (el,
GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS) {
gst_element_set_state (el, GST_STATE_NULL); gst_element_set_state (el, GST_STATE_NULL);
GST_LOG ("This worked!"); GST_LOG ("This worked!");
choice = el; choice = el;
@ -225,25 +227,25 @@ gst_auto_audio_sink_detect (GstAutoAudioSink * sink)
return TRUE; return TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_auto_audio_sink_change_state (GstElement * element) gst_auto_audio_sink_change_state (GstElement * element,
GstStateChange transition)
{ {
GstAutoAudioSink *sink = GST_AUTO_AUDIO_SINK (element); GstAutoAudioSink *sink = GST_AUTO_AUDIO_SINK (element);
GST_DEBUG_OBJECT (element, "Change state 0x%x", GST_DEBUG_OBJECT (element, "Change state 0x%x", transition);
GST_STATE_TRANSITION (element));
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_auto_audio_sink_detect (sink)) if (!gst_auto_audio_sink_detect (sink))
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_auto_audio_sink_reset (sink); gst_auto_audio_sink_reset (sink);
break; break;
default: default:
break; break;
} }
return GST_ELEMENT_CLASS (parent_class)->change_state (element); return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
} }

26
gst/autodetect/gstautovideosink.c
View file

@ -26,8 +26,9 @@
#include "gstautovideosink.h" #include "gstautovideosink.h"
#include "gstautodetect.h" #include "gstautodetect.h"
static GstElementStateReturn static GstStateChangeReturn
gst_auto_video_sink_change_state (GstElement * element); gst_auto_video_sink_change_state (GstElement * element,
GstStateChange transition);
GST_BOILERPLATE (GstAutoVideoSink, gst_auto_video_sink, GstBin, GST_TYPE_BIN); GST_BOILERPLATE (GstAutoVideoSink, gst_auto_video_sink, GstBin, GST_TYPE_BIN);
@ -143,7 +144,8 @@ gst_auto_video_sink_find_best (GstAutoVideoSink * sink)
GST_DEBUG_OBJECT (sink, "Trying %s", GST_PLUGIN_FEATURE (f)->name); GST_DEBUG_OBJECT (sink, "Trying %s", GST_PLUGIN_FEATURE (f)->name);
if ((el = gst_element_factory_create (f, "actual-sink"))) { if ((el = gst_element_factory_create (f, "actual-sink"))) {
GST_DEBUG_OBJECT (sink, "Changing state to READY"); GST_DEBUG_OBJECT (sink, "Changing state to READY");
if (gst_element_set_state (el, GST_STATE_READY) == GST_STATE_SUCCESS) { if (gst_element_set_state (el,
GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS) {
GST_DEBUG_OBJECT (sink, "success"); GST_DEBUG_OBJECT (sink, "success");
return el; return el;
} }
@ -186,25 +188,25 @@ gst_auto_video_sink_detect (GstAutoVideoSink * sink)
return TRUE; return TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_auto_video_sink_change_state (GstElement * element) gst_auto_video_sink_change_state (GstElement * element,
GstStateChange transition)
{ {
GstAutoVideoSink *sink = GST_AUTO_VIDEO_SINK (element); GstAutoVideoSink *sink = GST_AUTO_VIDEO_SINK (element);
GST_DEBUG_OBJECT (element, "Change state 0x%x", GST_DEBUG_OBJECT (element, "Change state 0x%x", transition);
GST_STATE_TRANSITION (element));
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_auto_video_sink_detect (sink)) if (!gst_auto_video_sink_detect (sink))
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_auto_video_sink_reset (sink); gst_auto_video_sink_reset (sink);
break; break;
default: default:
break; break;
} }
return GST_ELEMENT_CLASS (parent_class)->change_state (element); return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
} }

15
gst/avi/gstavidemux.c
View file

@ -64,7 +64,8 @@ static void gst_avi_demux_loop (GstPad * pad);
static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad); static gboolean gst_avi_demux_sink_activate (GstPad * sinkpad);
static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad, static gboolean gst_avi_demux_sink_activate_pull (GstPad * sinkpad,
gboolean active); gboolean active);
static GstElementStateReturn gst_avi_demux_change_state (GstElement * element); static GstStateChangeReturn gst_avi_demux_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -2189,13 +2190,13 @@ gst_avi_demux_sink_activate_pull (GstPad * sinkpad, gboolean active)
return TRUE; return TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_avi_demux_change_state (GstElement * element) gst_avi_demux_change_state (GstElement * element, GstStateChange transition)
{ {
GstAviDemux *avi = GST_AVI_DEMUX (element); GstAviDemux *avi = GST_AVI_DEMUX (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_avi_demux_reset (avi); gst_avi_demux_reset (avi);
break; break;
default: default:
@ -2203,7 +2204,7 @@ gst_avi_demux_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;
} }

18
gst/avi/gstavimux.c
View file

@ -155,7 +155,8 @@ static void gst_avimux_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec); guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_avimux_get_property (GObject * object, static void gst_avimux_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_avimux_change_state (GstElement * element); static GstStateChangeReturn gst_avimux_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -1308,21 +1309,20 @@ gst_avimux_set_property (GObject * object,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_avimux_change_state (GstElement * element) gst_avimux_change_state (GstElement * element, GstStateChange transition)
{ {
GstAviMux *avimux; GstAviMux *avimux;
gint transition = GST_STATE_TRANSITION (element);
g_return_val_if_fail (GST_IS_AVIMUX (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_AVIMUX (element), GST_STATE_CHANGE_FAILURE);
avimux = GST_AVIMUX (element); avimux = GST_AVIMUX (element);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
avimux->video_pad_eos = avimux->audio_pad_eos = FALSE; avimux->video_pad_eos = avimux->audio_pad_eos = FALSE;
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
if (avimux->tags) { if (avimux->tags) {
gst_tag_list_free (avimux->tags); gst_tag_list_free (avimux->tags);
avimux->tags = NULL; avimux->tags = NULL;
@ -1331,7 +1331,7 @@ gst_avimux_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;
} }

14
gst/debug/breakmydata.c
View file

@ -84,7 +84,7 @@ GST_BOILERPLATE (GstBreakMyData, gst_break_my_data, GstElement,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static void gst_break_my_data_chain (GstPad * pad, GstData * _data); static void gst_break_my_data_chain (GstPad * pad, GstData * _data);
static GstElementStateReturn gst_break_my_data_change_state (GstElement * static GstStateChangeReturn gst_break_my_data_change_state (GstElement *
element); element);
static void gst_break_my_data_base_init (gpointer g_class) static void gst_break_my_data_base_init (gpointer g_class)
@ -231,17 +231,17 @@ gst_break_my_data_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_break_my_data_change_state (GstElement * element) gst_break_my_data_change_state (GstElement * element, GstStateChange transition)
{ {
GstBreakMyData *bmd = GST_BREAK_MY_DATA (element); GstBreakMyData *bmd = GST_BREAK_MY_DATA (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
bmd->rand = g_rand_new_with_seed (bmd->seed); bmd->rand = g_rand_new_with_seed (bmd->seed);
bmd->skipped = 0; bmd->skipped = 0;
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
g_rand_free (bmd->rand); g_rand_free (bmd->rand);
break; break;
default: default:
@ -249,7 +249,7 @@ gst_break_my_data_change_state (GstElement * element)
} }
return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state, return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
(element), GST_STATE_SUCCESS); (element), GST_STATE_CHANGE_SUCCESS);
} }
gboolean gboolean

18
gst/debug/gstnavigationtest.c
View file

@ -66,8 +66,9 @@ static void gst_navigationtest_set_property (GObject * object, guint prop_id,
static void gst_navigationtest_get_property (GObject * object, guint prop_id, static void gst_navigationtest_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn static GstStateChangeReturn
gst_navigationtest_change_state (GstElement * element); gst_navigationtest_change_state (GstElement * element,
GstStateChange transition);
static void gst_navigationtest_planar411 (GstVideofilter * videofilter, static void gst_navigationtest_planar411 (GstVideofilter * videofilter,
void *dest, void *src); void *dest, void *src);
@ -355,13 +356,14 @@ gst_navigationtest_planar411 (GstVideofilter * videofilter,
rint (navigationtest->y), 0, 128, 128); rint (navigationtest->y), 0, 128, 128);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_navigationtest_change_state (GstElement * element) gst_navigationtest_change_state (GstElement * element,
GstStateChange transition)
{ {
GstNavigationtest *navigation = GST_NAVIGATIONTEST (element); GstNavigationtest *navigation = GST_NAVIGATIONTEST (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
while (navigation->clicks) { while (navigation->clicks) {
g_free (navigation->clicks->data); g_free (navigation->clicks->data);
navigation->clicks = navigation->clicks =
@ -371,7 +373,7 @@ gst_navigationtest_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;
} }

15
gst/effectv/gstquark.c
View file

@ -88,7 +88,8 @@ static void gst_quarktv_base_init (gpointer g_class);
static void gst_quarktv_class_init (GstQuarkTVClass * klass); static void gst_quarktv_class_init (GstQuarkTVClass * klass);
static void gst_quarktv_init (GstQuarkTV * filter); static void gst_quarktv_init (GstQuarkTV * filter);
static GstElementStateReturn gst_quarktv_change_state (GstElement * element); static GstStateChangeReturn gst_quarktv_change_state (GstElement * element,
GstStateChange transition);
static void gst_quarktv_set_property (GObject * object, guint prop_id, static void gst_quarktv_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
@ -281,13 +282,13 @@ no_buffer:
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_quarktv_change_state (GstElement * element) gst_quarktv_change_state (GstElement * element, GstStateChange transition)
{ {
GstQuarkTV *filter = GST_QUARKTV (element); GstQuarkTV *filter = GST_QUARKTV (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
{ {
gint i; gint i;
@ -300,7 +301,7 @@ gst_quarktv_change_state (GstElement * element)
filter->planetable = NULL; filter->planetable = NULL;
break; break;
} }
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
{ {
filter->planetable = filter->planetable =
(GstBuffer **) g_malloc (filter->planes * sizeof (GstBuffer *)); (GstBuffer **) g_malloc (filter->planes * sizeof (GstBuffer *));
@ -311,7 +312,7 @@ gst_quarktv_change_state (GstElement * element)
break; break;
} }
return GST_ELEMENT_CLASS (parent_class)->change_state (element); return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
} }

21
gst/fdsrc/gstfdsrc.c
View file

@ -81,7 +81,8 @@ static void gst_fdsrc_set_property (GObject * object, guint prop_id,
static void gst_fdsrc_get_property (GObject * object, guint prop_id, static void gst_fdsrc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_fdsrc_change_state (GstElement * element); static GstStateChangeReturn gst_fdsrc_change_state (GstElement * element,
GstStateChange transition);
static GstFlowReturn gst_fdsrc_create (GstPushSrc * psrc, GstBuffer ** outbuf); static GstFlowReturn gst_fdsrc_create (GstPushSrc * psrc, GstBuffer ** outbuf);
@ -146,29 +147,29 @@ gst_fdsrc_init (GstFdSrc * fdsrc, GstFdSrcClass * g_class)
fdsrc->seq = 0; fdsrc->seq = 0;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_fdsrc_change_state (GstElement * element) gst_fdsrc_change_state (GstElement * element, GstStateChange transition)
{ {
GstFdSrc *src = GST_FDSRC (element); GstFdSrc *src = GST_FDSRC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
src->curoffset = 0; src->curoffset = 0;
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
default: default:
break; break;
} }
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;
} }

25
gst/flx/gstflxdec.c
View file

@ -72,7 +72,8 @@ static void gst_flxdec_init (GstFlxDec * flxdec);
static void gst_flxdec_loop (GstElement * element); static void gst_flxdec_loop (GstElement * element);
static GstElementStateReturn gst_flxdec_change_state (GstElement * element); static GstStateChangeReturn gst_flxdec_change_state (GstElement * element,
GstStateChange transition);
static void gst_flxdec_set_property (GObject * object, guint prop_id, static void gst_flxdec_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
@ -574,38 +575,38 @@ gst_flxdec_loop (GstElement * element)
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_flxdec_change_state (GstElement * element) gst_flxdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstFlxDec *flxdec; GstFlxDec *flxdec;
flxdec = GST_FLXDEC (element); flxdec = GST_FLXDEC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
flxdec->bs = gst_bytestream_new (flxdec->sinkpad); flxdec->bs = gst_bytestream_new (flxdec->sinkpad);
flxdec->state = GST_FLXDEC_READ_HEADER; flxdec->state = GST_FLXDEC_READ_HEADER;
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:
gst_buffer_unref (flxdec->frame); gst_buffer_unref (flxdec->frame);
flxdec->frame = NULL; flxdec->frame = NULL;
gst_buffer_unref (flxdec->delta); gst_buffer_unref (flxdec->delta);
flxdec->delta = NULL; flxdec->delta = NULL;
gst_bytestream_destroy (flxdec->bs); gst_bytestream_destroy (flxdec->bs);
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
} }
parent_class->change_state (element); parent_class->change_state (element, transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static void static void

21
gst/goom/gstgoom.c
View file

@ -88,7 +88,8 @@ static void gst_goom_base_init (GstGoomClass * klass);
static void gst_goom_init (GstGoom * goom); static void gst_goom_init (GstGoom * goom);
static void gst_goom_dispose (GObject * object); static void gst_goom_dispose (GObject * object);
static GstElementStateReturn gst_goom_change_state (GstElement * element); static GstStateChangeReturn gst_goom_change_state (GstElement * element,
GstStateChange transition);
static GstFlowReturn gst_goom_chain (GstPad * pad, GstBuffer * buffer); static GstFlowReturn gst_goom_chain (GstPad * pad, GstBuffer * buffer);
static gboolean gst_goom_event (GstPad * pad, GstEvent * event); static gboolean gst_goom_event (GstPad * pad, GstEvent * event);
@ -409,19 +410,17 @@ no_format:
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_goom_change_state (GstElement * element) gst_goom_change_state (GstElement * element, GstStateChange transition)
{ {
GstGoom *goom = GST_GOOM (element); GstGoom *goom = GST_GOOM (element);
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
goom->audio_basetime = GST_CLOCK_TIME_NONE; goom->audio_basetime = GST_CLOCK_TIME_NONE;
gst_adapter_clear (goom->adapter); gst_adapter_clear (goom->adapter);
goom->channels = 0; goom->channels = 0;
@ -430,12 +429,12 @@ gst_goom_change_state (GstElement * element)
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

19
gst/matroska/ebml-read.c
View file

@ -39,7 +39,8 @@ enum
static void gst_ebml_read_class_init (GstEbmlReadClass * klass); static void gst_ebml_read_class_init (GstEbmlReadClass * klass);
static void gst_ebml_read_init (GstEbmlRead * ebml); static void gst_ebml_read_init (GstEbmlRead * ebml);
static GstElementStateReturn gst_ebml_read_change_state (GstElement * element); static GstStateChangeReturn gst_ebml_read_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -91,18 +92,18 @@ gst_ebml_read_init (GstEbmlRead * ebml)
ebml->id_cache = 0; ebml->id_cache = 0;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_ebml_read_change_state (GstElement * element) gst_ebml_read_change_state (GstElement * element, GstStateChange transition)
{ {
GstEbmlRead *ebml = GST_EBML_READ (element); GstEbmlRead *ebml = GST_EBML_READ (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!ebml->sinkpad) if (!ebml->sinkpad)
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
ebml->bs = gst_bytestream_new (ebml->sinkpad); ebml->bs = gst_bytestream_new (ebml->sinkpad);
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_bytestream_destroy (ebml->bs); gst_bytestream_destroy (ebml->bs);
while (ebml->level) { while (ebml->level) {
GstEbmlLevel *level = ebml->level->data; GstEbmlLevel *level = ebml->level->data;
@ -116,9 +117,9 @@ gst_ebml_read_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;
} }
/* /*

15
gst/matroska/ebml-write.c
View file

@ -36,7 +36,8 @@ enum
static void gst_ebml_write_class_init (GstEbmlWriteClass * klass); static void gst_ebml_write_class_init (GstEbmlWriteClass * klass);
static void gst_ebml_write_init (GstEbmlWrite * ebml); static void gst_ebml_write_init (GstEbmlWrite * ebml);
static GstElementStateReturn gst_ebml_write_change_state (GstElement * element); static GstStateChangeReturn gst_ebml_write_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -85,13 +86,13 @@ gst_ebml_write_init (GstEbmlWrite * ebml)
ebml->cache = NULL; ebml->cache = NULL;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_ebml_write_change_state (GstElement * element) gst_ebml_write_change_state (GstElement * element, GstStateChange transition)
{ {
GstEbmlWrite *ebml = GST_EBML_WRITE (element); GstEbmlWrite *ebml = GST_EBML_WRITE (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
ebml->pos = 0; ebml->pos = 0;
break; break;
default: default:
@ -99,9 +100,9 @@ gst_ebml_write_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;
} }
/* /*

19
gst/matroska/matroska-demux.c
View file

@ -77,8 +77,9 @@ static gboolean gst_matroska_demux_handle_src_query (GstPad * pad,
GstQueryType type, GstFormat * format, gint64 * value); GstQueryType type, GstFormat * format, gint64 * value);
/* gst internal change state handler */ /* gst internal change state handler */
static GstElementStateReturn static GstStateChangeReturn
gst_matroska_demux_change_state (GstElement * element); gst_matroska_demux_change_state (GstElement * element,
GstStateChange transition);
static void gst_matroska_demux_set_clock (GstElement * element, static void gst_matroska_demux_set_clock (GstElement * element,
GstClock * clock); GstClock * clock);
@ -2864,13 +2865,14 @@ gst_matroska_demux_subtitle_caps (GstMatroskaTrackSubtitleContext *
return caps; return caps;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_matroska_demux_change_state (GstElement * element) gst_matroska_demux_change_state (GstElement * element,
GstStateChange transition)
{ {
GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element); GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_matroska_demux_reset (GST_ELEMENT (demux)); gst_matroska_demux_reset (GST_ELEMENT (demux));
break; break;
default: default:
@ -2878,9 +2880,10 @@ gst_matroska_demux_change_state (GstElement * element)
} }
if (((GstElementClass *) parent_class)->change_state) if (((GstElementClass *) parent_class)->change_state)
return ((GstElementClass *) parent_class)->change_state (element); return ((GstElementClass *) parent_class)->change_state (element,
transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
gboolean gboolean

17
gst/matroska/matroska-mux.c
View file

@ -129,8 +129,8 @@ static GstPad *gst_matroska_mux_request_new_pad (GstElement * element,
GstPadTemplate * templ, const gchar * name); GstPadTemplate * templ, const gchar * name);
/* gst internal change state handler */ /* gst internal change state handler */
static GstElementStateReturn static GstStateChangeReturn
gst_matroska_mux_change_state (GstElement * element); gst_matroska_mux_change_state (GstElement * element, GstStateChange transition);
/* gobject bla bla */ /* gobject bla bla */
static void gst_matroska_mux_set_property (GObject * object, static void gst_matroska_mux_set_property (GObject * object,
@ -1157,13 +1157,13 @@ gst_matroska_mux_loop (GstElement * element)
gst_matroska_mux_write_data (mux); gst_matroska_mux_write_data (mux);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_matroska_mux_change_state (GstElement * element) gst_matroska_mux_change_state (GstElement * element, GstStateChange transition)
{ {
GstMatroskaMux *mux = GST_MATROSKA_MUX (element); GstMatroskaMux *mux = GST_MATROSKA_MUX (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_matroska_mux_reset (GST_ELEMENT (mux)); gst_matroska_mux_reset (GST_ELEMENT (mux));
break; break;
default: default:
@ -1171,9 +1171,10 @@ gst_matroska_mux_change_state (GstElement * element)
} }
if (((GstElementClass *) parent_class)->change_state) if (((GstElementClass *) parent_class)->change_state)
return ((GstElementClass *) parent_class)->change_state (element); return ((GstElementClass *) parent_class)->change_state (element,
transition);
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static void static void

23
gst/multipart/multipartdemux.c
View file

@ -119,7 +119,7 @@ static void gst_multipart_demux_finalize (GObject * object);
static void gst_multipart_demux_chain (GstPad * pad, GstData * buffer); static void gst_multipart_demux_chain (GstPad * pad, GstData * buffer);
static GstElementStateReturn gst_multipart_demux_change_state (GstElement * static GstStateChangeReturn gst_multipart_demux_change_state (GstElement *
element); element);
@ -336,36 +336,37 @@ gst_multipart_demux_chain (GstPad * pad, GstData * buffer)
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_multipart_demux_change_state (GstElement * element) gst_multipart_demux_change_state (GstElement * element,
GstStateChange transition)
{ {
GstMultipartDemux *multipart; GstMultipartDemux *multipart;
multipart = GST_MULTIPART_DEMUX (element); multipart = GST_MULTIPART_DEMUX (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
multipart->buffer = g_malloc (multipart->maxlen); multipart->buffer = g_malloc (multipart->maxlen);
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:
g_free (multipart->parsing_mime); g_free (multipart->parsing_mime);
multipart->parsing_mime = NULL; multipart->parsing_mime = NULL;
g_free (multipart->buffer); g_free (multipart->buffer);
multipart->buffer = NULL; multipart->buffer = NULL;
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;
} }
return parent_class->change_state (element); return parent_class->change_state (element, transition);
} }
gboolean gboolean

26
gst/multipart/multipartmux.c
View file

@ -121,7 +121,7 @@ static void gst_multipart_mux_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_multipart_mux_get_property (GObject * object, guint prop_id, static void gst_multipart_mux_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_multipart_mux_change_state (GstElement * static GstStateChangeReturn gst_multipart_mux_change_state (GstElement *
element); element);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -563,33 +563,33 @@ gst_multipart_mux_set_property (GObject * object,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_multipart_mux_change_state (GstElement * element) gst_multipart_mux_change_state (GstElement * element, GstStateChange transition)
{ {
GstMultipartMux *multipart_mux; GstMultipartMux *multipart_mux;
gint transition = GST_STATE_TRANSITION (element);
g_return_val_if_fail (GST_IS_MULTIPART_MUX (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_MULTIPART_MUX (element),
GST_STATE_CHANGE_FAILURE);
multipart_mux = GST_MULTIPART_MUX (element); multipart_mux = GST_MULTIPART_MUX (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
multipart_mux->offset = 0; multipart_mux->offset = 0;
multipart_mux->negotiated = FALSE; multipart_mux->negotiated = FALSE;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
} }
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;
} }
gboolean gboolean

19
gst/oldcore/gstmd5sink.c
View file

@ -72,7 +72,8 @@ static void gst_md5sink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static void gst_md5sink_chain (GstPad * pad, GstData * _data); static void gst_md5sink_chain (GstPad * pad, GstData * _data);
static GstElementStateReturn gst_md5sink_change_state (GstElement * element); static GstStateChangeReturn gst_md5sink_change_state (GstElement * element,
GstStateChange transition);
/* MD5 stuff */ /* MD5 stuff */
@ -415,22 +416,22 @@ gst_md5sink_init (GstMD5Sink * md5sink)
md5_init_ctx (md5sink); md5_init_ctx (md5sink);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_md5sink_change_state (GstElement * element) gst_md5sink_change_state (GstElement * element, GstStateChange transition)
{ {
GstMD5Sink *sink; GstMD5Sink *sink;
/* element check */ /* element check */
sink = GST_MD5SINK (element); sink = GST_MD5SINK (element);
g_return_val_if_fail (GST_IS_MD5SINK (sink), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_MD5SINK (sink), GST_STATE_CHANGE_FAILURE);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
md5_init_ctx (sink); md5_init_ctx (sink);
g_object_notify (G_OBJECT (element), "md5"); g_object_notify (G_OBJECT (element), "md5");
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
md5_finish_ctx (sink, sink->md5); md5_finish_ctx (sink, sink->md5);
g_object_notify (G_OBJECT (element), "md5"); g_object_notify (G_OBJECT (element), "md5");
break; break;
@ -439,9 +440,9 @@ gst_md5sink_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

13
gst/oldcore/gstmultifilesrc.c
View file

@ -80,7 +80,7 @@ static GstData *gst_multifilesrc_get (GstPad * pad);
/*static GstBuffer * gst_multifilesrc_get_region (GstPad *pad,GstRegionType type,guint64 offset,guint64 len);*/ /*static GstBuffer * gst_multifilesrc_get_region (GstPad *pad,GstRegionType type,guint64 offset,guint64 len);*/
static GstElementStateReturn gst_multifilesrc_change_state (GstElement * static GstStateChangeReturn gst_multifilesrc_change_state (GstElement *
element); element);
static gboolean gst_multifilesrc_open_file (GstMultiFileSrc * src, static gboolean gst_multifilesrc_open_file (GstMultiFileSrc * src,
@ -345,10 +345,11 @@ gst_multifilesrc_close_file (GstMultiFileSrc * src)
GST_FLAG_UNSET (src, GST_MULTIFILESRC_OPEN); GST_FLAG_UNSET (src, GST_MULTIFILESRC_OPEN);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_multifilesrc_change_state (GstElement * element) gst_multifilesrc_change_state (GstElement * element, GstStateChange transition)
{ {
g_return_val_if_fail (GST_IS_MULTIFILESRC (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_MULTIFILESRC (element),
GST_STATE_CHANGE_FAILURE);
if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
if (GST_FLAG_IS_SET (element, GST_MULTIFILESRC_OPEN)) if (GST_FLAG_IS_SET (element, GST_MULTIFILESRC_OPEN))
@ -356,7 +357,7 @@ gst_multifilesrc_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;
} }

13
gst/oldcore/gstpipefilter.c
View file

@ -86,7 +86,8 @@ static GstData *gst_pipefilter_get (GstPad * pad);
static void gst_pipefilter_chain (GstPad * pad, GstData * _data); static void gst_pipefilter_chain (GstPad * pad, GstData * _data);
static gboolean gst_pipefilter_handle_event (GstPad * pad, GstEvent * event); static gboolean gst_pipefilter_handle_event (GstPad * pad, GstEvent * event);
static GstElementStateReturn gst_pipefilter_change_state (GstElement * element); static GstStateChangeReturn gst_pipefilter_change_state (GstElement * element,
GstStateChange transition);
static void static void
gst_pipefilter_base_init (gpointer g_class) gst_pipefilter_base_init (gpointer g_class)
@ -331,8 +332,8 @@ gst_pipefilter_close_file (GstPipefilter * src)
GST_FLAG_UNSET (src, GST_PIPEFILTER_OPEN); GST_FLAG_UNSET (src, GST_PIPEFILTER_OPEN);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_pipefilter_change_state (GstElement * element) gst_pipefilter_change_state (GstElement * element, GstStateChange transition)
{ {
g_return_val_if_fail (GST_IS_PIPEFILTER (element), FALSE); g_return_val_if_fail (GST_IS_PIPEFILTER (element), FALSE);
@ -344,11 +345,11 @@ gst_pipefilter_change_state (GstElement * element)
} else { } else {
if (!GST_FLAG_IS_SET (element, GST_PIPEFILTER_OPEN)) { if (!GST_FLAG_IS_SET (element, GST_PIPEFILTER_OPEN)) {
if (!gst_pipefilter_open_file (GST_PIPEFILTER (element))) if (!gst_pipefilter_open_file (GST_PIPEFILTER (element)))
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }
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;
} }

20
gst/rtp/gstrtpL16depay.c
View file

@ -70,8 +70,7 @@ static void gst_rtpL16parse_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_rtpL16parse_get_property (GObject * object, guint prop_id, static void gst_rtpL16parse_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpL16parse_change_state (GstElement * static GstStateChangeReturn gst_rtpL16parse_change_state (GstElement * element);
element);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -310,21 +309,22 @@ gst_rtpL16parse_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpL16parse_change_state (GstElement * element) gst_rtpL16parse_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpL16Parse *rtpL16parse; GstRtpL16Parse *rtpL16parse;
g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element),
GST_STATE_CHANGE_FAILURE);
rtpL16parse = GST_RTP_L16_PARSE (element); rtpL16parse = GST_RTP_L16_PARSE (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;
@ -332,9 +332,9 @@ gst_rtpL16parse_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

19
gst/rtp/gstrtpL16enc.c
View file

@ -74,7 +74,8 @@ static void gst_rtpL16enc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstPadLinkReturn gst_rtpL16enc_sinkconnect (GstPad * pad, static GstPadLinkReturn gst_rtpL16enc_sinkconnect (GstPad * pad,
const GstCaps * caps); const GstCaps * caps);
static GstElementStateReturn gst_rtpL16enc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpL16enc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -306,23 +307,23 @@ gst_rtpL16enc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpL16enc_change_state (GstElement * element) gst_rtpL16enc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpL16Enc *rtpL16enc; GstRtpL16Enc *rtpL16enc;
g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_CHANGE_FAILURE);
rtpL16enc = GST_RTP_L16_ENC (element); rtpL16enc = GST_RTP_L16_ENC (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
/* if going down into NULL state, close the file if it's open */ /* if going down into NULL state, close the file if it's open */
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
@ -331,9 +332,9 @@ gst_rtpL16enc_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

20
gst/rtp/gstrtpL16parse.c
View file

@ -70,8 +70,7 @@ static void gst_rtpL16parse_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_rtpL16parse_get_property (GObject * object, guint prop_id, static void gst_rtpL16parse_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpL16parse_change_state (GstElement * static GstStateChangeReturn gst_rtpL16parse_change_state (GstElement * element);
element);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -310,21 +309,22 @@ gst_rtpL16parse_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpL16parse_change_state (GstElement * element) gst_rtpL16parse_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpL16Parse *rtpL16parse; GstRtpL16Parse *rtpL16parse;
g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_L16_PARSE (element),
GST_STATE_CHANGE_FAILURE);
rtpL16parse = GST_RTP_L16_PARSE (element); rtpL16parse = GST_RTP_L16_PARSE (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;
@ -332,9 +332,9 @@ gst_rtpL16parse_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

19
gst/rtp/gstrtpL16pay.c
View file

@ -74,7 +74,8 @@ static void gst_rtpL16enc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstPadLinkReturn gst_rtpL16enc_sinkconnect (GstPad * pad, static GstPadLinkReturn gst_rtpL16enc_sinkconnect (GstPad * pad,
const GstCaps * caps); const GstCaps * caps);
static GstElementStateReturn gst_rtpL16enc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpL16enc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -306,23 +307,23 @@ gst_rtpL16enc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpL16enc_change_state (GstElement * element) gst_rtpL16enc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpL16Enc *rtpL16enc; GstRtpL16Enc *rtpL16enc;
g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_L16_ENC (element), GST_STATE_CHANGE_FAILURE);
rtpL16enc = GST_RTP_L16_ENC (element); rtpL16enc = GST_RTP_L16_ENC (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
/* if going down into NULL state, close the file if it's open */ /* if going down into NULL state, close the file if it's open */
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
@ -331,9 +332,9 @@ gst_rtpL16enc_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

19
gst/rtp/gstrtpamrdec.c
View file

@ -93,7 +93,8 @@ static void gst_rtpamrdec_set_property (GObject * object, guint prop_id,
static void gst_rtpamrdec_get_property (GObject * object, guint prop_id, static void gst_rtpamrdec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpamrdec_change_state (GstElement * element); static GstStateChangeReturn gst_rtpamrdec_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -379,20 +380,18 @@ gst_rtpamrdec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpamrdec_change_state (GstElement * element) gst_rtpamrdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpAMRDec *rtpamrdec; GstRtpAMRDec *rtpamrdec;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpamrdec = GST_RTP_AMR_DEC (element); rtpamrdec = GST_RTP_AMR_DEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
/* FIXME, don't require negotiation until all elements /* FIXME, don't require negotiation until all elements
* do */ * do */
rtpamrdec->negotiated = TRUE; rtpamrdec->negotiated = TRUE;
@ -401,10 +400,10 @@ gst_rtpamrdec_change_state (GstElement * element)
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

19
gst/rtp/gstrtpamrdepay.c
View file

@ -93,7 +93,8 @@ static void gst_rtpamrdec_set_property (GObject * object, guint prop_id,
static void gst_rtpamrdec_get_property (GObject * object, guint prop_id, static void gst_rtpamrdec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpamrdec_change_state (GstElement * element); static GstStateChangeReturn gst_rtpamrdec_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -379,20 +380,18 @@ gst_rtpamrdec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpamrdec_change_state (GstElement * element) gst_rtpamrdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpAMRDec *rtpamrdec; GstRtpAMRDec *rtpamrdec;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpamrdec = GST_RTP_AMR_DEC (element); rtpamrdec = GST_RTP_AMR_DEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
/* FIXME, don't require negotiation until all elements /* FIXME, don't require negotiation until all elements
* do */ * do */
rtpamrdec->negotiated = TRUE; rtpamrdec->negotiated = TRUE;
@ -401,10 +400,10 @@ gst_rtpamrdec_change_state (GstElement * element)
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

19
gst/rtp/gstrtpamrenc.c
View file

@ -92,7 +92,8 @@ static void gst_rtpamrenc_set_property (GObject * object, guint prop_id,
static void gst_rtpamrenc_get_property (GObject * object, guint prop_id, static void gst_rtpamrenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpamrenc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpamrenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -312,30 +313,28 @@ gst_rtpamrenc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpamrenc_change_state (GstElement * element) gst_rtpamrenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpAMREnc *rtpamrenc; GstRtpAMREnc *rtpamrenc;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpamrenc = GST_RTP_AMR_ENC (element); rtpamrenc = GST_RTP_AMR_ENC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
rtpamrenc->seqnum = 0; rtpamrenc->seqnum = 0;
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

19
gst/rtp/gstrtpamrpay.c
View file

@ -92,7 +92,8 @@ static void gst_rtpamrenc_set_property (GObject * object, guint prop_id,
static void gst_rtpamrenc_get_property (GObject * object, guint prop_id, static void gst_rtpamrenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpamrenc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpamrenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -312,30 +313,28 @@ gst_rtpamrenc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpamrenc_change_state (GstElement * element) gst_rtpamrenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpAMREnc *rtpamrenc; GstRtpAMREnc *rtpamrenc;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpamrenc = GST_RTP_AMR_ENC (element); rtpamrenc = GST_RTP_AMR_ENC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
rtpamrenc->seqnum = 0; rtpamrenc->seqnum = 0;
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

17
gst/rtp/gstrtpdec.c
View file

@ -82,7 +82,8 @@ static void gst_rtpdec_set_property (GObject * object,
static void gst_rtpdec_get_property (GObject * object, static void gst_rtpdec_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpdec_change_state (GstElement * element); static GstStateChangeReturn gst_rtpdec_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -226,27 +227,25 @@ gst_rtpdec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpdec_change_state (GstElement * element) gst_rtpdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
GstRTPDec *rtpdec; GstRTPDec *rtpdec;
gint transition;
rtpdec = GST_RTPDEC (element); rtpdec = GST_RTPDEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
default: default:
break; break;

17
gst/rtp/gstrtpdepay.c
View file

@ -82,7 +82,8 @@ static void gst_rtpdec_set_property (GObject * object,
static void gst_rtpdec_get_property (GObject * object, static void gst_rtpdec_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpdec_change_state (GstElement * element); static GstStateChangeReturn gst_rtpdec_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -226,27 +227,25 @@ gst_rtpdec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpdec_change_state (GstElement * element) gst_rtpdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
GstRTPDec *rtpdec; GstRTPDec *rtpdec;
gint transition;
rtpdec = GST_RTPDEC (element); rtpdec = GST_RTPDEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
default: default:
break; break;

20
gst/rtp/gstrtpgsmdepay.c
View file

@ -66,8 +66,7 @@ static void gst_rtpgsmparse_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_rtpgsmparse_get_property (GObject * object, guint prop_id, static void gst_rtpgsmparse_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpgsmparse_change_state (GstElement * static GstStateChangeReturn gst_rtpgsmparse_change_state (GstElement * element);
element);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -272,21 +271,22 @@ gst_rtpgsmparse_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpgsmparse_change_state (GstElement * element) gst_rtpgsmparse_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpGSMParse *rtpgsmparse; GstRtpGSMParse *rtpgsmparse;
g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element),
GST_STATE_CHANGE_FAILURE);
rtpgsmparse = GST_RTP_GSM_PARSE (element); rtpgsmparse = GST_RTP_GSM_PARSE (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;
@ -294,9 +294,9 @@ gst_rtpgsmparse_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

19
gst/rtp/gstrtpgsmenc.c
View file

@ -71,7 +71,8 @@ static void gst_rtpgsmenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstPadLinkReturn gst_rtpgsmenc_sinkconnect (GstPad * pad, static GstPadLinkReturn gst_rtpgsmenc_sinkconnect (GstPad * pad,
const GstCaps * caps); const GstCaps * caps);
static GstElementStateReturn gst_rtpgsmenc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpgsmenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -292,23 +293,23 @@ gst_rtpgsmenc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpgsmenc_change_state (GstElement * element) gst_rtpgsmenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpGSMEnc *rtpgsmenc; GstRtpGSMEnc *rtpgsmenc;
g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_CHANGE_FAILURE);
rtpgsmenc = GST_RTP_GSM_ENC (element); rtpgsmenc = GST_RTP_GSM_ENC (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
/* if going down into NULL state, close the file if it's open */ /* if going down into NULL state, close the file if it's open */
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
@ -317,9 +318,9 @@ gst_rtpgsmenc_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

20
gst/rtp/gstrtpgsmparse.c
View file

@ -66,8 +66,7 @@ static void gst_rtpgsmparse_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_rtpgsmparse_get_property (GObject * object, guint prop_id, static void gst_rtpgsmparse_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpgsmparse_change_state (GstElement * static GstStateChangeReturn gst_rtpgsmparse_change_state (GstElement * element);
element);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -272,21 +271,22 @@ gst_rtpgsmparse_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpgsmparse_change_state (GstElement * element) gst_rtpgsmparse_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpGSMParse *rtpgsmparse; GstRtpGSMParse *rtpgsmparse;
g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_GSM_PARSE (element),
GST_STATE_CHANGE_FAILURE);
rtpgsmparse = GST_RTP_GSM_PARSE (element); rtpgsmparse = GST_RTP_GSM_PARSE (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;
@ -294,9 +294,9 @@ gst_rtpgsmparse_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

19
gst/rtp/gstrtpgsmpay.c
View file

@ -71,7 +71,8 @@ static void gst_rtpgsmenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstPadLinkReturn gst_rtpgsmenc_sinkconnect (GstPad * pad, static GstPadLinkReturn gst_rtpgsmenc_sinkconnect (GstPad * pad,
const GstCaps * caps); const GstCaps * caps);
static GstElementStateReturn gst_rtpgsmenc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpgsmenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -292,23 +293,23 @@ gst_rtpgsmenc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpgsmenc_change_state (GstElement * element) gst_rtpgsmenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpGSMEnc *rtpgsmenc; GstRtpGSMEnc *rtpgsmenc;
g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_RTP_GSM_ENC (element), GST_STATE_CHANGE_FAILURE);
rtpgsmenc = GST_RTP_GSM_ENC (element); rtpgsmenc = GST_RTP_GSM_ENC (element);
GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element)); GST_DEBUG ("state pending %d\n", GST_STATE_PENDING (element));
/* if going down into NULL state, close the file if it's open */ /* if going down into NULL state, close the file if it's open */
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
@ -317,9 +318,9 @@ gst_rtpgsmenc_change_state (GstElement * element)
/* if we haven't failed already, give the parent class a chance to ;-) */ /* if we haven't failed already, give the parent class a chance to ;-) */
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;
} }
gboolean gboolean

18
gst/rtp/gstrtph263pdec.c
View file

@ -68,8 +68,8 @@ static void gst_rtph263pdec_set_property (GObject * object, guint prop_id,
static void gst_rtph263pdec_get_property (GObject * object, guint prop_id, static void gst_rtph263pdec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtph263pdec_change_state (GstElement * static GstStateChangeReturn gst_rtph263pdec_change_state (GstElement *
element); element, GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -281,27 +281,25 @@ gst_rtph263pdec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtph263pdec_change_state (GstElement * element) gst_rtph263pdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpH263PDec *rtph263pdec; GstRtpH263PDec *rtph263pdec;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtph263pdec = GST_RTP_H263P_DEC (element); rtph263pdec = GST_RTP_H263P_DEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

18
gst/rtp/gstrtph263pdepay.c
View file

@ -68,8 +68,8 @@ static void gst_rtph263pdec_set_property (GObject * object, guint prop_id,
static void gst_rtph263pdec_get_property (GObject * object, guint prop_id, static void gst_rtph263pdec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtph263pdec_change_state (GstElement * static GstStateChangeReturn gst_rtph263pdec_change_state (GstElement *
element); element, GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -281,27 +281,25 @@ gst_rtph263pdec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtph263pdec_change_state (GstElement * element) gst_rtph263pdec_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpH263PDec *rtph263pdec; GstRtpH263PDec *rtph263pdec;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtph263pdec = GST_RTP_H263P_DEC (element); rtph263pdec = GST_RTP_H263P_DEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

18
gst/rtp/gstrtph263penc.c
View file

@ -75,8 +75,8 @@ static void gst_rtph263penc_set_property (GObject * object, guint prop_id,
static void gst_rtph263penc_get_property (GObject * object, guint prop_id, static void gst_rtph263penc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtph263penc_change_state (GstElement * static GstStateChangeReturn gst_rtph263penc_change_state (GstElement *
element); element, GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -298,27 +298,25 @@ gst_rtph263penc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtph263penc_change_state (GstElement * element) gst_rtph263penc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpH263PEnc *rtph263penc; GstRtpH263PEnc *rtph263penc;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtph263penc = GST_RTP_H263P_ENC (element); rtph263penc = GST_RTP_H263P_ENC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

18
gst/rtp/gstrtph263ppay.c
View file

@ -75,8 +75,8 @@ static void gst_rtph263penc_set_property (GObject * object, guint prop_id,
static void gst_rtph263penc_get_property (GObject * object, guint prop_id, static void gst_rtph263penc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtph263penc_change_state (GstElement * static GstStateChangeReturn gst_rtph263penc_change_state (GstElement *
element); element, GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -298,27 +298,25 @@ gst_rtph263penc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtph263penc_change_state (GstElement * element) gst_rtph263penc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpH263PEnc *rtph263penc; GstRtpH263PEnc *rtph263penc;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtph263penc = GST_RTP_H263P_ENC (element); rtph263penc = GST_RTP_H263P_ENC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

17
gst/rtp/gstrtpmpadec.c
View file

@ -68,7 +68,8 @@ static void gst_rtpmpadec_set_property (GObject * object, guint prop_id,
static void gst_rtpmpadec_get_property (GObject * object, guint prop_id, static void gst_rtpmpadec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpmpadec_change_state (GstElement * element); static GstStateChangeReturn gst_rtpmpadec_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -236,27 +237,25 @@ gst_rtpmpadec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpmpadec_change_state (GstElement * element) gst_rtpmpadec_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpMPADec *rtpmpadec; GstRtpMPADec *rtpmpadec;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpmpadec = GST_RTP_MPA_DEC (element); rtpmpadec = GST_RTP_MPA_DEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

17
gst/rtp/gstrtpmpadepay.c
View file

@ -68,7 +68,8 @@ static void gst_rtpmpadec_set_property (GObject * object, guint prop_id,
static void gst_rtpmpadec_get_property (GObject * object, guint prop_id, static void gst_rtpmpadec_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpmpadec_change_state (GstElement * element); static GstStateChangeReturn gst_rtpmpadec_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -236,27 +237,25 @@ gst_rtpmpadec_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpmpadec_change_state (GstElement * element) gst_rtpmpadec_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpMPADec *rtpmpadec; GstRtpMPADec *rtpmpadec;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpmpadec = GST_RTP_MPA_DEC (element); rtpmpadec = GST_RTP_MPA_DEC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

19
gst/rtp/gstrtpmpaenc.c
View file

@ -71,7 +71,8 @@ static void gst_rtpmpaenc_set_property (GObject * object, guint prop_id,
static void gst_rtpmpaenc_get_property (GObject * object, guint prop_id, static void gst_rtpmpaenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpmpaenc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpmpaenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -292,30 +293,28 @@ gst_rtpmpaenc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpmpaenc_change_state (GstElement * element) gst_rtpmpaenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpMPAEnc *rtpmpaenc; GstRtpMPAEnc *rtpmpaenc;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpmpaenc = GST_RTP_MPA_ENC (element); rtpmpaenc = GST_RTP_MPA_ENC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
rtpmpaenc->seqnum = 0; rtpmpaenc->seqnum = 0;
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

19
gst/rtp/gstrtpmpapay.c
View file

@ -71,7 +71,8 @@ static void gst_rtpmpaenc_set_property (GObject * object, guint prop_id,
static void gst_rtpmpaenc_get_property (GObject * object, guint prop_id, static void gst_rtpmpaenc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_rtpmpaenc_change_state (GstElement * element); static GstStateChangeReturn gst_rtpmpaenc_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -292,30 +293,28 @@ gst_rtpmpaenc_get_property (GObject * object, guint prop_id, GValue * value,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtpmpaenc_change_state (GstElement * element) gst_rtpmpaenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRtpMPAEnc *rtpmpaenc; GstRtpMPAEnc *rtpmpaenc;
gint transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtpmpaenc = GST_RTP_MPA_ENC (element); rtpmpaenc = GST_RTP_MPA_ENC (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
rtpmpaenc->seqnum = 0; rtpmpaenc->seqnum = 0;
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;

56
gst/rtsp/gstrtspsrc.c
View file

@ -88,7 +88,8 @@ static void gst_rtspsrc_base_init (gpointer g_class);
static void gst_rtspsrc_class_init (GstRTSPSrc * klass); static void gst_rtspsrc_class_init (GstRTSPSrc * klass);
static void gst_rtspsrc_init (GstRTSPSrc * rtspsrc); static void gst_rtspsrc_init (GstRTSPSrc * rtspsrc);
static GstElementStateReturn gst_rtspsrc_change_state (GstElement * element); static GstStateChangeReturn gst_rtspsrc_change_state (GstElement * element,
GstStateChange transition);
static void gst_rtspsrc_set_property (GObject * object, guint prop_id, static void gst_rtspsrc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
@ -248,13 +249,13 @@ gst_rtspsrc_add_element (GstRTSPSrc * src, GstElement * element)
return TRUE; return TRUE;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtspsrc_set_state (GstRTSPSrc * src, GstElementState state) gst_rtspsrc_set_state (GstRTSPSrc * src, GstState state)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
GList *streams; GList *streams;
ret = GST_STATE_SUCCESS; ret = GST_STATE_CHANGE_SUCCESS;
/* for all streams */ /* for all streams */
for (streams = src->streams; streams; streams = g_list_next (streams)) { for (streams = src->streams; streams; streams = g_list_next (streams)) {
@ -264,20 +265,21 @@ gst_rtspsrc_set_state (GstRTSPSrc * src, GstElementState state)
/* first our rtp session manager */ /* first our rtp session manager */
if ((ret = if ((ret =
gst_element_set_state (stream->rtpdec, state)) == GST_STATE_FAILURE) gst_element_set_state (stream->rtpdec,
state)) == GST_STATE_CHANGE_FAILURE)
goto done; goto done;
/* then our sources */ /* then our sources */
if (stream->rtpsrc) { if (stream->rtpsrc) {
if ((ret = if ((ret =
gst_element_set_state (stream->rtpsrc, gst_element_set_state (stream->rtpsrc,
state)) == GST_STATE_FAILURE) state)) == GST_STATE_CHANGE_FAILURE)
goto done; goto done;
} }
if (stream->rtcpsrc) { if (stream->rtcpsrc) {
if ((ret = if ((ret =
gst_element_set_state (stream->rtcpsrc, gst_element_set_state (stream->rtcpsrc,
state)) == GST_STATE_FAILURE) state)) == GST_STATE_CHANGE_FAILURE)
goto done; goto done;
} }
} }
@ -290,7 +292,7 @@ static gboolean
gst_rtspsrc_stream_setup_rtp (GstRTSPStream * stream, gint * rtpport, gst_rtspsrc_stream_setup_rtp (GstRTSPStream * stream, gint * rtpport,
gint * rtcpport) gint * rtcpport)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
GstRTSPSrc *src; GstRTSPSrc *src;
src = stream->parent; src = stream->parent;
@ -303,7 +305,7 @@ gst_rtspsrc_stream_setup_rtp (GstRTSPStream * stream, gint * rtpport,
gst_rtspsrc_add_element (src, stream->rtpsrc); gst_rtspsrc_add_element (src, stream->rtpsrc);
ret = gst_element_set_state (stream->rtpsrc, GST_STATE_PAUSED); ret = gst_element_set_state (stream->rtpsrc, GST_STATE_PAUSED);
if (ret == GST_STATE_FAILURE) if (ret == GST_STATE_CHANGE_FAILURE)
goto start_rtp_failure; goto start_rtp_failure;
if (!(stream->rtcpsrc = if (!(stream->rtcpsrc =
@ -314,7 +316,7 @@ gst_rtspsrc_stream_setup_rtp (GstRTSPStream * stream, gint * rtpport,
gst_rtspsrc_add_element (src, stream->rtcpsrc); gst_rtspsrc_add_element (src, stream->rtcpsrc);
ret = gst_element_set_state (stream->rtcpsrc, GST_STATE_PAUSED); ret = gst_element_set_state (stream->rtcpsrc, GST_STATE_PAUSED);
if (ret == GST_STATE_FAILURE) if (ret == GST_STATE_CHANGE_FAILURE)
goto start_rtcp_failure; goto start_rtcp_failure;
g_object_get (G_OBJECT (stream->rtpsrc), "port", rtpport, NULL); g_object_get (G_OBJECT (stream->rtpsrc), "port", rtpport, NULL);
@ -351,7 +353,7 @@ gst_rtspsrc_stream_configure_transport (GstRTSPStream * stream,
{ {
GstRTSPSrc *src; GstRTSPSrc *src;
GstPad *pad; GstPad *pad;
GstElementStateReturn ret; GstStateChangeReturn ret;
gchar *name; gchar *name;
src = stream->parent; src = stream->parent;
@ -364,7 +366,7 @@ gst_rtspsrc_stream_configure_transport (GstRTSPStream * stream,
if ((ret = if ((ret =
gst_element_set_state (stream->rtpdec, gst_element_set_state (stream->rtpdec,
GST_STATE_PAUSED)) != GST_STATE_SUCCESS) GST_STATE_PAUSED)) != GST_STATE_CHANGE_SUCCESS)
goto start_rtpdec_failure; goto start_rtpdec_failure;
stream->rtpdecrtp = gst_element_get_pad (stream->rtpdec, "sinkrtp"); stream->rtpdecrtp = gst_element_get_pad (stream->rtpdec, "sinkrtp");
@ -966,49 +968,47 @@ send_error:
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_rtspsrc_change_state (GstElement * element) gst_rtspsrc_change_state (GstElement * element, GstStateChange transition)
{ {
GstRTSPSrc *rtspsrc; GstRTSPSrc *rtspsrc;
GstElementState transition; GstStateChangeReturn ret;
GstElementStateReturn ret;
rtspsrc = GST_RTSPSRC (element); rtspsrc = GST_RTSPSRC (element);
transition = GST_STATE_TRANSITION (rtspsrc);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
rtspsrc->interleaved = FALSE; rtspsrc->interleaved = FALSE;
rtspsrc->options = 0; rtspsrc->options = 0;
if (!gst_rtspsrc_open (rtspsrc)) if (!gst_rtspsrc_open (rtspsrc))
goto open_failed; goto open_failed;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
gst_rtspsrc_play (rtspsrc); gst_rtspsrc_play (rtspsrc);
break; break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
if (ret == GST_STATE_FAILURE) if (ret == GST_STATE_CHANGE_FAILURE)
goto done; goto done;
ret = gst_rtspsrc_set_state (rtspsrc, GST_STATE_PENDING (rtspsrc)); ret = gst_rtspsrc_set_state (rtspsrc, GST_STATE_PENDING (rtspsrc));
if (ret == GST_STATE_FAILURE) if (ret == GST_STATE_CHANGE_FAILURE)
goto done; goto done;
switch (transition) { switch (transition) {
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
gst_rtspsrc_pause (rtspsrc); gst_rtspsrc_pause (rtspsrc);
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_rtspsrc_close (rtspsrc); gst_rtspsrc_close (rtspsrc);
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
default: default:
break; break;
@ -1019,6 +1019,6 @@ done:
open_failed: open_failed:
{ {
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }

19
gst/smoothwave/gstsmoothwave.c
View file

@ -47,7 +47,8 @@ static void gst_smoothwave_base_init (gpointer g_class);
static void gst_smoothwave_class_init (GstSmoothWaveClass * klass); static void gst_smoothwave_class_init (GstSmoothWaveClass * klass);
static void gst_smoothwave_init (GstSmoothWave * smoothwave); static void gst_smoothwave_init (GstSmoothWave * smoothwave);
static void gst_smoothwave_dispose (GObject * object); static void gst_smoothwave_dispose (GObject * object);
static GstElementStateReturn gst_sw_change_state (GstElement * element); static GstStateChangeReturn gst_sw_change_state (GstElement * element,
GstStateChange transition);
static void gst_smoothwave_chain (GstPad * pad, GstData * _data); static void gst_smoothwave_chain (GstPad * pad, GstData * _data);
static GstPadLinkReturn gst_sw_sinklink (GstPad * pad, const GstCaps * caps); static GstPadLinkReturn gst_sw_sinklink (GstPad * pad, const GstCaps * caps);
static GstPadLinkReturn gst_sw_srclink (GstPad * pad, const GstCaps * caps); static GstPadLinkReturn gst_sw_srclink (GstPad * pad, const GstCaps * caps);
@ -401,28 +402,28 @@ gst_smoothwave_chain (GstPad * pad, GstData * _data)
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_sw_change_state (GstElement * element) gst_sw_change_state (GstElement * element, GstStateChange transition)
{ {
GstSmoothWave *sw = GST_SMOOTHWAVE (element); GstSmoothWave *sw = GST_SMOOTHWAVE (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
sw->audio_basetime = GST_CLOCK_TIME_NONE; sw->audio_basetime = GST_CLOCK_TIME_NONE;
gst_adapter_clear (sw->adapter); gst_adapter_clear (sw->adapter);
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
sw->channels = 0; sw->channels = 0;
break; break;
default: default:
break; break;
} }
return GST_ELEMENT_CLASS (parent_class)->change_state (element); return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
} }
static gboolean static gboolean

19
gst/udp/gstdynudpsink.c
View file

@ -67,7 +67,8 @@ static void gst_dynudpsink_get_times (GstBaseSink * sink, GstBuffer * buffer,
static GstFlowReturn gst_dynudpsink_render (GstBaseSink * sink, static GstFlowReturn gst_dynudpsink_render (GstBaseSink * sink,
GstBuffer * buffer); GstBuffer * buffer);
static void gst_dynudpsink_close (GstDynUDPSink * sink); static void gst_dynudpsink_close (GstDynUDPSink * sink);
static GstElementStateReturn gst_dynudpsink_change_state (GstElement * element); static GstStateChangeReturn gst_dynudpsink_change_state (GstElement * element,
GstStateChange transition);
static void gst_dynudpsink_set_property (GObject * object, guint prop_id, static void gst_dynudpsink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
@ -296,18 +297,16 @@ gst_dynudpsink_close (GstDynUDPSink * sink)
close (sink->sock); close (sink->sock);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_dynudpsink_change_state (GstElement * element) gst_dynudpsink_change_state (GstElement * element, GstStateChange transition)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
GstDynUDPSink *sink; GstDynUDPSink *sink;
gint transition;
sink = GST_DYNUDPSINK (element); sink = GST_DYNUDPSINK (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!gst_dynudpsink_init_send (sink)) if (!gst_dynudpsink_init_send (sink))
goto no_init; goto no_init;
break; break;
@ -315,10 +314,10 @@ gst_dynudpsink_change_state (GstElement * element)
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_dynudpsink_close (sink); gst_dynudpsink_close (sink);
break; break;
default: default:
@ -329,6 +328,6 @@ gst_dynudpsink_change_state (GstElement * element)
/* ERRORS */ /* ERRORS */
no_init: no_init:
{ {
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }

20
gst/udp/gstmultiudpsink.c
View file

@ -68,8 +68,8 @@ static void gst_multiudpsink_finalize (GObject * object);
static GstFlowReturn gst_multiudpsink_render (GstBaseSink * sink, static GstFlowReturn gst_multiudpsink_render (GstBaseSink * sink,
GstBuffer * buffer); GstBuffer * buffer);
static GstElementStateReturn gst_multiudpsink_change_state (GstElement * static GstStateChangeReturn gst_multiudpsink_change_state (GstElement *
element); element, GstStateChange transition);
static void gst_multiudpsink_set_property (GObject * object, guint prop_id, static void gst_multiudpsink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
@ -428,18 +428,16 @@ gst_multiudpsink_get_stats (GstMultiUDPSink * sink, const gchar * host,
return NULL; return NULL;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_multiudpsink_change_state (GstElement * element) gst_multiudpsink_change_state (GstElement * element, GstStateChange transition)
{ {
GstElementStateReturn ret; GstStateChangeReturn ret;
GstMultiUDPSink *sink; GstMultiUDPSink *sink;
gint transition;
sink = GST_MULTIUDPSINK (element); sink = GST_MULTIUDPSINK (element);
transition = GST_STATE_TRANSITION (element);
switch (transition) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!gst_multiudpsink_init_send (sink)) if (!gst_multiudpsink_init_send (sink))
goto no_init; goto no_init;
break; break;
@ -447,10 +445,10 @@ gst_multiudpsink_change_state (GstElement * element)
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
switch (transition) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_multiudpsink_close (sink); gst_multiudpsink_close (sink);
break; break;
default: default:
@ -461,6 +459,6 @@ gst_multiudpsink_change_state (GstElement * element)
/* ERRORS */ /* ERRORS */
no_init: no_init:
{ {
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
} }

26
gst/videomixer/videomixer.c
View file

@ -409,7 +409,8 @@ static void gst_videomixer_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_videomixer_get_property (GObject * object, guint prop_id, static void gst_videomixer_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_videomixer_change_state (GstElement * element); static GstStateChangeReturn gst_videomixer_change_state (GstElement * element,
GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -1112,31 +1113,30 @@ gst_videomixer_set_property (GObject * object,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_videomixer_change_state (GstElement * element) gst_videomixer_change_state (GstElement * element, GstStateChange transition)
{ {
GstVideoMixer *mix; GstVideoMixer *mix;
gint transition = GST_STATE_TRANSITION (element);
g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_FAILURE); g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_CHANGE_FAILURE);
mix = GST_VIDEO_MIXER (element); mix = GST_VIDEO_MIXER (element);
switch (transition) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
} }
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 gboolean static gboolean

12
gst/wavenc/gstwavenc.c
View file

@ -122,13 +122,13 @@ gst_wavenc_get_type (void)
return type; return type;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_wavenc_change_state (GstElement * element) gst_wavenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstWavEnc *wavenc = GST_WAVENC (element); GstWavEnc *wavenc = GST_WAVENC (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
wavenc->setup = FALSE; wavenc->setup = FALSE;
wavenc->flush_header = TRUE; wavenc->flush_header = TRUE;
break; break;
@ -137,10 +137,10 @@ gst_wavenc_change_state (GstElement * element)
} }
if (parent_class->change_state) { if (parent_class->change_state) {
return parent_class->change_state (element); return parent_class->change_state (element, transition);
} }
return GST_STATE_SUCCESS; return GST_STATE_CHANGE_SUCCESS;
} }
static void static void

25
gst/wavparse/gstwavparse.c
View file

@ -42,7 +42,8 @@ static void gst_wavparse_init (GstWavParse * wavparse);
static gboolean gst_wavparse_sink_activate (GstPad * sinkpad); static gboolean gst_wavparse_sink_activate (GstPad * sinkpad);
static gboolean gst_wavparse_sink_activate_pull (GstPad * sinkpad, static gboolean gst_wavparse_sink_activate_pull (GstPad * sinkpad,
gboolean active); gboolean active);
static GstElementStateReturn gst_wavparse_change_state (GstElement * element); static GstStateChangeReturn gst_wavparse_change_state (GstElement * element,
GstStateChange transition);
static gboolean gst_wavparse_pad_query (GstPad * pad, GstQuery * query); static gboolean gst_wavparse_pad_query (GstPad * pad, GstQuery * query);
static const GstQueryType *gst_wavparse_get_query_types (GstPad * pad); static const GstQueryType *gst_wavparse_get_query_types (GstPad * pad);
@ -1181,38 +1182,38 @@ gst_wavparse_sink_activate_pull (GstPad * sinkpad, gboolean active)
return TRUE; return TRUE;
}; };
static GstElementStateReturn static GstStateChangeReturn
gst_wavparse_change_state (GstElement * element) gst_wavparse_change_state (GstElement * element, GstStateChange transition)
{ {
GstWavParse *wav = GST_WAVPARSE (element); GstWavParse *wav = GST_WAVPARSE (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
wav->state = GST_WAVPARSE_START; wav->state = GST_WAVPARSE_START;
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:
gst_wavparse_destroy_sourcepad (wav); gst_wavparse_destroy_sourcepad (wav);
gst_wavparse_reset (wav); gst_wavparse_reset (wav);
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
break; break;
} }
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 gboolean static gboolean

4
po/af.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.7.6\n" "Project-Id-Version: gst-plugins 0.7.6\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-03-18 14:16+0200\n" "PO-Revision-Date: 2004-03-18 14:16+0200\n"
"Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n" "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
"Language-Team: Afrikaans <i18n@af.org.za>\n" "Language-Team: Afrikaans <i18n@af.org.za>\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n" "Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Geen of ongeldige klanktoevoer, AVI-stroom sal korrup wees." msgstr "Geen of ongeldige klanktoevoer, AVI-stroom sal korrup wees."

4
po/az.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins-0.8.0\n" "Project-Id-Version: gst-plugins-0.8.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-03-19 18:29+0200\n" "PO-Revision-Date: 2004-03-19 18:29+0200\n"
"Last-Translator: Metin Amiroff <metin@karegen.com>\n" "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n" "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n" "X-Generator: KBabel 1.0.2\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Səhv ya da olmayan audio girişi, AVI yayımı pozulacaqdır." msgstr "Səhv ya da olmayan audio girişi, AVI yayımı pozulacaqdır."

4
po/cs.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n" "Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-08-08 22:58+0200\n" "PO-Revision-Date: 2004-08-08 22:58+0200\n"
"Last-Translator: Miloslav Trmac <mitr@volny.cz>\n" "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@ -18,7 +18,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Žádný nebo neplatný vstup zvuku, proud AVI bude poškozen." msgstr "Žádný nebo neplatný vstup zvuku, proud AVI bude poškozen."

4
po/en_GB.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.1\n" "Project-Id-Version: gst-plugins 0.8.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-04-26 10:41-0400\n" "PO-Revision-Date: 2004-04-26 10:41-0400\n"
"Last-Translator: Gareth Owen <gowen72@yahoo.com>\n" "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
"Language-Team: English (British) <en_gb@li.org>\n" "Language-Team: English (British) <en_gb@li.org>\n"
@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "No or invalid input audio, AVI stream will be corrupt." msgstr "No or invalid input audio, AVI stream will be corrupt."

4
po/hu.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.2\n" "Project-Id-Version: gst-plugins 0.8.2\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-07-18 11:03+0200\n" "PO-Revision-Date: 2004-07-18 11:03+0200\n"
"Last-Translator: Laszlo Dvornik <dvornik@invitel.hu>\n" "Last-Translator: Laszlo Dvornik <dvornik@invitel.hu>\n"
"Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Nincs vagy érvénytelen bemeneti hang, az AVI-folyam sérült lesz." msgstr "Nincs vagy érvénytelen bemeneti hang, az AVI-folyam sérült lesz."

4
po/it.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n" "Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-11-07 19:11+0100\n" "PO-Revision-Date: 2004-11-07 19:11+0100\n"
"Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n" "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n" "Language-Team: Italian <tp@lists.linux.it>\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Ingresso audio assente o non valido. Lo stream AVI risulterà corrotto." msgstr "Ingresso audio assente o non valido. Lo stream AVI risulterà corrotto."

4
po/nb.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n" "Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-10-04 15:54+0200\n" "PO-Revision-Date: 2004-10-04 15:54+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n" "Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "" msgstr ""

4
po/nl.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n" "Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-08-05 16:26+0200\n" "PO-Revision-Date: 2004-08-05 16:26+0200\n"
"Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n" "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n" "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Geen of ongeldig invoergeluid, AVI-stroom zal slecht zijn." msgstr "Geen of ongeldig invoergeluid, AVI-stroom zal slecht zijn."

6
po/or.po
View file

@ -2,13 +2,13 @@
# Copyright (C) 2004, Free Software Foundation, Inc. # Copyright (C) 2004, Free Software Foundation, Inc.
# This file is distributed under the same license as the gst-plugins-0.8.3 package. # This file is distributed under the same license as the gst-plugins-0.8.3 package.
# Gora Mohanty <gora_mohanty@yahoo.co.in>, 2004. # Gora Mohanty <gora_mohanty@yahoo.co.in>, 2004.
# $Id: or.po,v 1.7 2005/08/28 17:59:20 wingo Exp $ # $Id: or.po,v 1.8 2005/08/30 17:32:12 thomasvs Exp $
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins-0.8.3\n" "Project-Id-Version: gst-plugins-0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-09-27 13:32+0530\n" "PO-Revision-Date: 2004-09-27 13:32+0530\n"
"Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n" "Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
"Language-Team: Oriya <gora_mohanty@yahoo.co.in>\n" "Language-Team: Oriya <gora_mohanty@yahoo.co.in>\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "ନିବେଶ ଧ୍ବନି ନାହିଁ ବା ଅବୈଧ ଅଛି. ଏ.ଭି.ଆଇ. ଧାରା ଭ୍ରଷ୍ଟ ହୋଇଯିବ." msgstr "ନିବେଶ ଧ୍ବନି ନାହିଁ ବା ଅବୈଧ ଅଛି. ଏ.ଭି.ଆଇ. ଧାରା ଭ୍ରଷ୍ଟ ହୋଇଯିବ."

4
po/sq.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n" "Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-08-07 20:29+0200\n" "PO-Revision-Date: 2004-08-07 20:29+0200\n"
"Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n" "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
"Language-Team: Albanian <begraj@hotmail.com>\n" "Language-Team: Albanian <begraj@hotmail.com>\n"
@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Input audio i gabuar ose mungon, stream AVI mund të jetë i dëmtuar." msgstr "Input audio i gabuar ose mungon, stream AVI mund të jetë i dëmtuar."

4
po/sr.po
View file

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.7.6\n" "Project-Id-Version: gst-plugins 0.7.6\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-03-13 00:18+0100\n" "PO-Revision-Date: 2004-03-13 00:18+0100\n"
"Last-Translator: Danilo Segan <dsegan@gmx.net>\n" "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
"Language-Team: Serbian <gnu@prevod.org>\n" "Language-Team: Serbian <gnu@prevod.org>\n"
@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Улазног звука нема или је неисправан, АВИ ток ће бити искварен." msgstr "Улазног звука нема или је неисправан, АВИ ток ће бити искварен."

4
po/sv.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.3\n" "Project-Id-Version: gst-plugins 0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-08-03 20:53+0200\n" "PO-Revision-Date: 2004-08-03 20:53+0200\n"
"Last-Translator: Christian Rose <menthos@menthos.com>\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n"
"Language-Team: Swedish <sv@li.org>\n" "Language-Team: Swedish <sv@li.org>\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Inget eller ogiltigt inljud. AVI-flödet kommer att skadas." msgstr "Inget eller ogiltigt inljud. AVI-flödet kommer att skadas."

4
po/uk.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins 0.8.2\n" "Project-Id-Version: gst-plugins 0.8.2\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2004-08-03 15:40+0200\n" "PO-Revision-Date: 2004-08-03 15:40+0200\n"
"Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n" "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "Відсутній або неправильний вхід звуку, AVI потік буде пошкоджений." msgstr "Відсутній або неправильний вхід звуку, AVI потік буде пошкоджений."

4
po/vi.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gst-plugins-0.8.3\n" "Project-Id-Version: gst-plugins-0.8.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-08-30 19:21+0200\n" "POT-Creation-Date: 2005-09-02 17:36+0200\n"
"PO-Revision-Date: 2005-01-22 17:17+0930\n" "PO-Revision-Date: 2005-01-22 17:17+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net> \n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net> \n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gst/avi/gstavimux.c:1007 #: gst/avi/gstavimux.c:1008
msgid "No or invalid input audio, AVI stream will be corrupt." msgid "No or invalid input audio, AVI stream will be corrupt."
msgstr "" msgstr ""
"Chưa có dữ liệu âm thanh nhập, hoặc dữ liệu âm thanh nhập không hợp lệ. Sẽ " "Chưa có dữ liệu âm thanh nhập, hoặc dữ liệu âm thanh nhập không hợp lệ. Sẽ "

19
sys/oss/gstossmixerelement.c
View file

@ -38,8 +38,8 @@ GST_BOILERPLATE_WITH_INTERFACE (GstOssMixerElement, gst_oss_mixer_element,
GST_IMPLEMENT_OSS_MIXER_METHODS (GstOssMixerElement, gst_oss_mixer_element); GST_IMPLEMENT_OSS_MIXER_METHODS (GstOssMixerElement, gst_oss_mixer_element);
static GstElementStateReturn gst_oss_mixer_element_change_state (GstElement * static GstStateChangeReturn gst_oss_mixer_element_change_state (GstElement *
element); element, GstStateChange transition);
static void static void
gst_oss_mixer_element_base_init (gpointer klass) gst_oss_mixer_element_base_init (gpointer klass)
@ -65,18 +65,19 @@ gst_oss_mixer_element_init (GstOssMixerElement * this,
this->mixer = NULL; this->mixer = NULL;
} }
static GstElementStateReturn static GstStateChangeReturn
gst_oss_mixer_element_change_state (GstElement * element) gst_oss_mixer_element_change_state (GstElement * element,
GstStateChange transition)
{ {
GstOssMixerElement *this = GST_OSS_MIXER_ELEMENT (element); GstOssMixerElement *this = GST_OSS_MIXER_ELEMENT (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!this->mixer) { if (!this->mixer) {
this->mixer = gst_ossmixer_new ("/dev/mixer", GST_OSS_MIXER_ALL); this->mixer = gst_ossmixer_new ("/dev/mixer", GST_OSS_MIXER_ALL);
} }
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (this->mixer) { if (this->mixer) {
gst_ossmixer_free (this->mixer); gst_ossmixer_free (this->mixer);
this->mixer = NULL; this->mixer = NULL;
@ -87,7 +88,7 @@ gst_oss_mixer_element_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;
} }

19
sys/osxaudio/gstosxaudioelement.c
View file

@ -56,7 +56,7 @@ static void gst_osxaudioelement_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec); guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_osxaudioelement_get_property (GObject * object, static void gst_osxaudioelement_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec); guint prop_id, GValue * value, GParamSpec * pspec);
static GstElementStateReturn gst_osxaudioelement_change_state (GstElement * static GstStateChangeReturn gst_osxaudioelement_change_state (GstElement *
element); element);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
@ -411,8 +411,9 @@ gst_osxaudioelement_get_property (GObject * object,
} }
} }
static GstElementStateReturn static GstStateChangeReturn
gst_osxaudioelement_change_state (GstElement * element) gst_osxaudioelement_change_state (GstElement * element,
GstStateChange transition)
{ {
GstOsxAudioElement *osxaudio = GST_OSXAUDIOELEMENT (element); GstOsxAudioElement *osxaudio = GST_OSXAUDIOELEMENT (element);
const GList *padlist; const GList *padlist;
@ -426,14 +427,14 @@ gst_osxaudioelement_change_state (GstElement * element)
input = FALSE; input = FALSE;
} }
} }
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_osxaudioelement_open_audio (osxaudio, input)) { if (!gst_osxaudioelement_open_audio (osxaudio, input)) {
return GST_STATE_FAILURE; return GST_STATE_CHANGE_FAILURE;
} }
GST_INFO ("osxaudioelement: opened sound device"); GST_INFO ("osxaudioelement: opened sound device");
break; break;
case GST_STATE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_osxaudioelement_close_audio (osxaudio, input); gst_osxaudioelement_close_audio (osxaudio, input);
GST_INFO ("osxaudioelement: closed sound device"); GST_INFO ("osxaudioelement: closed sound device");
break; break;
@ -442,7 +443,7 @@ gst_osxaudioelement_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;
} }

20
sys/osxaudio/gstosxaudiosink.c
View file

@ -42,7 +42,7 @@ static void gst_osxaudiosink_class_init (GstOsxAudioSinkClass * klass);
static void gst_osxaudiosink_init (GstOsxAudioSink * osxaudiosink); static void gst_osxaudiosink_init (GstOsxAudioSink * osxaudiosink);
static void gst_osxaudiosink_dispose (GObject * object); static void gst_osxaudiosink_dispose (GObject * object);
static GstElementStateReturn gst_osxaudiosink_change_state (GstElement * static GstStateChangeReturn gst_osxaudiosink_change_state (GstElement *
element); element);
static void gst_osxaudiosink_chain (GstPad * pad, GstData * _data); static void gst_osxaudiosink_chain (GstPad * pad, GstData * _data);
@ -191,39 +191,39 @@ gst_osxaudiosink_chain (GstPad * pad, GstData * _data)
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_osxaudiosink_change_state (GstElement * element) gst_osxaudiosink_change_state (GstElement * element, GstStateChange transition)
{ {
GstOsxAudioSink *osxaudiosink; GstOsxAudioSink *osxaudiosink;
OSErr status; OSErr status;
osxaudiosink = GST_OSXAUDIOSINK (element); osxaudiosink = GST_OSXAUDIOSINK (element);
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
status = status =
AudioDeviceStart (GST_OSXAUDIOELEMENT (osxaudiosink)->device_id, AudioDeviceStart (GST_OSXAUDIOELEMENT (osxaudiosink)->device_id,
outputAudioDeviceIOProc); outputAudioDeviceIOProc);
if (status) if (status)
GST_DEBUG ("AudioDeviceStart returned %d\n", (int) status); GST_DEBUG ("AudioDeviceStart returned %d\n", (int) status);
break; break;
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
status = status =
AudioDeviceStop (GST_OSXAUDIOELEMENT (osxaudiosink)->device_id, AudioDeviceStop (GST_OSXAUDIOELEMENT (osxaudiosink)->device_id,
outputAudioDeviceIOProc); outputAudioDeviceIOProc);
if (status) if (status)
GST_DEBUG ("AudioDeviceStop returned %d\n", (int) status); GST_DEBUG ("AudioDeviceStop returned %d\n", (int) status);
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
default: default:
break; break;
} }
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;
} }

21
sys/osxaudio/gstosxaudiosrc.c
View file

@ -63,8 +63,7 @@ static void gst_osxaudiosrc_class_init (GstOsxAudioSrcClass * klass);
static void gst_osxaudiosrc_init (GstOsxAudioSrc * osxaudiosrc); static void gst_osxaudiosrc_init (GstOsxAudioSrc * osxaudiosrc);
static void gst_osxaudiosrc_dispose (GObject * object); static void gst_osxaudiosrc_dispose (GObject * object);
static GstElementStateReturn gst_osxaudiosrc_change_state (GstElement * static GstStateChangeReturn gst_osxaudiosrc_change_state (GstElement * element);
element);
static GstData *gst_osxaudiosrc_get (GstPad * pad); static GstData *gst_osxaudiosrc_get (GstPad * pad);
@ -178,40 +177,40 @@ gst_osxaudiosrc_get (GstPad * pad)
return GST_DATA (buf); return GST_DATA (buf);
} }
static GstElementStateReturn static GstStateChangeReturn
gst_osxaudiosrc_change_state (GstElement * element) gst_osxaudiosrc_change_state (GstElement * element, GstStateChange transition)
{ {
GstOsxAudioSrc *osxaudiosrc = GST_OSXAUDIOSRC (element); GstOsxAudioSrc *osxaudiosrc = GST_OSXAUDIOSRC (element);
OSErr status; OSErr status;
GST_DEBUG ("osxaudiosrc: state change"); GST_DEBUG ("osxaudiosrc: state change");
switch (GST_STATE_TRANSITION (element)) { switch (transition) {
case GST_STATE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
osxaudiosrc->curoffset = 0; osxaudiosrc->curoffset = 0;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
status = status =
AudioDeviceStart (GST_OSXAUDIOELEMENT (osxaudiosrc)->device_id, AudioDeviceStart (GST_OSXAUDIOELEMENT (osxaudiosrc)->device_id,
inputAudioDeviceIOProc); inputAudioDeviceIOProc);
if (status) if (status)
GST_DEBUG ("AudioDeviceStart returned %d\n", (int) status); GST_DEBUG ("AudioDeviceStart returned %d\n", (int) status);
break; break;
case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
status = status =
AudioDeviceStop (GST_OSXAUDIOELEMENT (osxaudiosrc)->device_id, AudioDeviceStop (GST_OSXAUDIOELEMENT (osxaudiosrc)->device_id,
inputAudioDeviceIOProc); inputAudioDeviceIOProc);
if (status) if (status)
GST_DEBUG ("AudioDeviceStop returned %d\n", (int) status); GST_DEBUG ("AudioDeviceStop returned %d\n", (int) status);
break; break;
case GST_STATE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
default: default:
break; break;
} }
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;
} }

3
tests/check/elements/level.c
View file

@ -103,7 +103,8 @@ GST_START_TEST (test_int16)
g_object_set (level, "message", TRUE, "interval", 0.1, NULL); g_object_set (level, "message", TRUE, "interval", 0.1, NULL);
fail_unless (gst_element_set_state (level, fail_unless (gst_element_set_state (level,
GST_STATE_PLAYING) == GST_STATE_SUCCESS, "could not set to playing"); GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
"could not set to playing");
/* create a fake 0.1 sec buffer with a half-amplitude block signal */ /* create a fake 0.1 sec buffer with a half-amplitude block signal */
inbuffer = gst_buffer_new_and_alloc (400); inbuffer = gst_buffer_new_and_alloc (400);