summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
Diffstat (limited to 'gst')
-rw-r--r--gst/apetag/apedemux.c15
-rw-r--r--gst/cdxaparse/gstcdxaparse.c17
-rw-r--r--gst/cdxaparse/gstcdxastrip.c15
-rw-r--r--gst/cdxaparse/gstvcdparse.c15
-rw-r--r--gst/colorspace/gstcolorspace.c17
-rw-r--r--gst/festival/gstfestival.c15
-rw-r--r--gst/librfb/gstrfbsrc.c23
-rw-r--r--gst/modplug/gstmodplug.cc25
-rw-r--r--gst/mpeg1videoparse/gstmp1videoparse.c20
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.c15
-rw-r--r--gst/multifilesink/gstmultifilesink.c21
-rw-r--r--gst/smoothwave/gstsmoothwave.c19
-rw-r--r--gst/speed/gstspeed.c17
-rw-r--r--gst/switch/gstswitch.c22
-rw-r--r--gst/videocrop/gstvideocrop.c25
-rw-r--r--gst/videodrop/gstvideodrop.c15
-rw-r--r--gst/y4m/gsty4mencode.c15
17 files changed, 163 insertions, 148 deletions
diff --git a/gst/apetag/apedemux.c b/gst/apetag/apedemux.c
index f1d10a2b..8f8197c1 100644
--- a/gst/apetag/apedemux.c
+++ b/gst/apetag/apedemux.c
@@ -54,7 +54,8 @@ static const GstQueryType *gst_ape_demux_get_src_query_types (GstPad * pad);
static gboolean gst_ape_demux_handle_src_query (GstPad * pad,
GstQueryType type, GstFormat * format, gint64 * value);
-static GstElementStateReturn gst_ape_demux_change_state (GstElement * element);
+static GstStateChangeReturn gst_ape_demux_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -787,13 +788,13 @@ gst_ape_demux_loop (GstElement * element)
}
}
-static GstElementStateReturn
-gst_ape_demux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_ape_demux_change_state (GstElement * element, GstStateChange transition)
{
GstApeDemux *ape = GST_APE_DEMUX (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
if (ape->srcpad) {
gst_element_remove_pad (element, ape->srcpad);
ape->srcpad = NULL;
@@ -806,7 +807,7 @@ gst_ape_demux_change_state (GstElement * element)
}
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;
}
diff --git a/gst/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c
index 502d96a8..10dbd6f1 100644
--- a/gst/cdxaparse/gstcdxaparse.c
+++ b/gst/cdxaparse/gstcdxaparse.c
@@ -33,7 +33,8 @@ static void gst_cdxaparse_class_init (GstCDXAParseClass * klass);
static void gst_cdxaparse_init (GstCDXAParse * cdxaparse);
static void gst_cdxaparse_loop (GstElement * element);
-static GstElementStateReturn gst_cdxaparse_change_state (GstElement * element);
+static GstStateChangeReturn gst_cdxaparse_change_state (GstElement * element,
+ GstStateChange transition);
static GstStaticPadTemplate sink_template_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
@@ -281,16 +282,16 @@ gst_cdxaparse_loop (GstElement * element)
}
}
-static GstElementStateReturn
-gst_cdxaparse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_cdxaparse_change_state (GstElement * element, GstStateChange transition)
{
GstCDXAParse *cdxa = GST_CDXAPARSE (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_READY_TO_PAUSED:
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
cdxa->state = GST_CDXAPARSE_START;
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
cdxa->state = GST_CDXAPARSE_START;
cdxa->seek_pending = FALSE;
cdxa->seek_offset = 0;
@@ -300,9 +301,9 @@ gst_cdxaparse_change_state (GstElement * element)
}
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
diff --git a/gst/cdxaparse/gstcdxastrip.c b/gst/cdxaparse/gstcdxastrip.c
index 312c3028..2138ce37 100644
--- a/gst/cdxaparse/gstcdxastrip.c
+++ b/gst/cdxaparse/gstcdxastrip.c
@@ -37,7 +37,8 @@ static gboolean gst_cdxastrip_handle_src_query (GstPad * pad,
GstQueryType type, GstFormat * format, gint64 * value);
static void gst_cdxastrip_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn gst_cdxastrip_change_state (GstElement * element);
+static GstStateChangeReturn gst_cdxastrip_change_state (GstElement * element,
+ GstStateChange transition);
static GstStaticPadTemplate sink_template_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
@@ -388,13 +389,13 @@ gst_cdxastrip_chain (GstPad * pad, GstData * data)
cdxa->cache = buf;
}
-static GstElementStateReturn
-gst_cdxastrip_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_cdxastrip_change_state (GstElement * element, GstStateChange transition)
{
GstCDXAStrip *cdxa = GST_CDXASTRIP (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
if (cdxa->cache) {
gst_buffer_unref (cdxa->cache);
cdxa->cache = NULL;
@@ -405,7 +406,7 @@ gst_cdxastrip_change_state (GstElement * element)
}
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;
}
diff --git a/gst/cdxaparse/gstvcdparse.c b/gst/cdxaparse/gstvcdparse.c
index 312c3028..2138ce37 100644
--- a/gst/cdxaparse/gstvcdparse.c
+++ b/gst/cdxaparse/gstvcdparse.c
@@ -37,7 +37,8 @@ static gboolean gst_cdxastrip_handle_src_query (GstPad * pad,
GstQueryType type, GstFormat * format, gint64 * value);
static void gst_cdxastrip_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn gst_cdxastrip_change_state (GstElement * element);
+static GstStateChangeReturn gst_cdxastrip_change_state (GstElement * element,
+ GstStateChange transition);
static GstStaticPadTemplate sink_template_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
@@ -388,13 +389,13 @@ gst_cdxastrip_chain (GstPad * pad, GstData * data)
cdxa->cache = buf;
}
-static GstElementStateReturn
-gst_cdxastrip_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_cdxastrip_change_state (GstElement * element, GstStateChange transition)
{
GstCDXAStrip *cdxa = GST_CDXASTRIP (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
if (cdxa->cache) {
gst_buffer_unref (cdxa->cache);
cdxa->cache = NULL;
@@ -405,7 +406,7 @@ gst_cdxastrip_change_state (GstElement * element)
}
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;
}
diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c
index bbdf48b4..5f2d2726 100644
--- a/gst/colorspace/gstcolorspace.c
+++ b/gst/colorspace/gstcolorspace.c
@@ -91,7 +91,8 @@ static void gst_colorspace_get_property (GObject * object, guint prop_id,
static GstPadLinkReturn
gst_colorspace_link (GstPad * pad, const GstCaps * caps);
static void gst_colorspace_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_colorspace_change_state (GstElement * element);
+static GstStateChangeReturn gst_colorspace_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -563,23 +564,23 @@ gst_colorspace_chain (GstPad * pad, GstData * _data)
gst_pad_push (space->srcpad, GST_DATA (outbuf));
}
-static GstElementStateReturn
-gst_colorspace_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_colorspace_change_state (GstElement * element, GstStateChange transition)
{
GstColorspace *space;
space = GST_COLORSPACE (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_PLAYING:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
}
- return parent_class->change_state (element);
+ return parent_class->change_state (element, transition);
}
static void
diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c
index 0aefe233..62e60e64 100644
--- a/gst/festival/gstfestival.c
+++ b/gst/festival/gstfestival.c
@@ -82,7 +82,8 @@ static void gst_festival_class_init (GstFestivalClass * klass);
static void gst_festival_init (GstFestival * festival);
static void gst_festival_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_festival_change_state (GstElement * element);
+static GstStateChangeReturn gst_festival_change_state (GstElement * element,
+ GstStateChange transition);
static FT_Info *festival_default_info (void);
static char *socket_receive_file_to_buff (int fd, int *size);
@@ -410,10 +411,10 @@ gst_festival_close (GstFestival * festival)
return;
}
-static GstElementStateReturn
-gst_festival_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_festival_change_state (GstElement * element, GstStateChange transition)
{
- g_return_val_if_fail (GST_IS_FESTIVAL (element), GST_STATE_FAILURE);
+ g_return_val_if_fail (GST_IS_FESTIVAL (element), GST_STATE_CHANGE_FAILURE);
if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
if (GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN))
@@ -421,14 +422,14 @@ gst_festival_change_state (GstElement * element)
} else {
if (!GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN)) {
if (!gst_festival_open (GST_FESTIVAL (element)))
- return GST_STATE_FAILURE;
+ return GST_STATE_CHANGE_FAILURE;
}
}
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
diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c
index 5793907b..5f53a3a3 100644
--- a/gst/librfb/gstrfbsrc.c
+++ b/gst/librfb/gstrfbsrc.c
@@ -100,8 +100,7 @@ gst_rfbsrc_get_type (void)
static void gst_rfbsrc_base_init (gpointer g_class);
static void gst_rfbsrc_class_init (GstRfbsrcClass * klass);
static void gst_rfbsrc_init (GstRfbsrc * rfbsrc);
- static GstElementStateReturn gst_rfbsrc_change_state (GstElement *
- element);
+ static GstStateChangeReturn gst_rfbsrc_change_state (GstElement * element);
static void gst_rfbsrc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
@@ -206,31 +205,31 @@ gst_rfbsrc_class_init (GstRfbsrcClass * klass)
gstelement_class->change_state = gst_rfbsrc_change_state;
}
-static GstElementStateReturn
-gst_rfbsrc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rfbsrc_change_state (GstElement * element, GstStateChange transition)
{
GstRfbsrc *rfbsrc;
rfbsrc = GST_RFBSRC (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_NULL_TO_READY:
rfbsrc->decoder = rfb_decoder_new ();
rfb_decoder_connect_tcp (rfbsrc->decoder, rfbsrc->server, rfbsrc->port);
rfbsrc->decoder->paint_rect = gst_rfbsrc_paint_rect;
rfbsrc->decoder->decoder_private = rfbsrc;
break;
- case GST_STATE_READY_TO_PAUSED:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
//rfbsrc->timestamp_offset = 0;
//rfbsrc->n_frames = 0;
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
if (rfbsrc->frame) {
g_free (rfbsrc->frame);
rfbsrc->frame = NULL;
@@ -238,7 +237,7 @@ gst_rfbsrc_change_state (GstElement * element)
break;
}
- return parent_class->change_state (element);
+ return parent_class->change_state (element, transition);
}
static void
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index 6d4c4ab5..dabcfcb3 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -111,7 +111,8 @@ static const GstQueryType *gst_modplug_get_query_types (GstPad * pad);
static gboolean gst_modplug_src_event (GstPad * pad, GstEvent * event);
static gboolean gst_modplug_src_query (GstPad * pad,
GstQueryType type, GstFormat * format, gint64 * value);
-static GstElementStateReturn gst_modplug_change_state (GstElement * element);
+static GstStateChangeReturn gst_modplug_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -673,26 +674,26 @@ gst_modplug_loop (GstElement * element)
}
-static GstElementStateReturn
-gst_modplug_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_modplug_change_state (GstElement * element, GstStateChange transition)
{
GstModPlug *modplug;
modplug = GST_MODPLUG (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_NULL_TO_READY:
break;
- case GST_STATE_READY_TO_PAUSED:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
modplug->bs = gst_bytestream_new (modplug->sinkpad);
modplug->song_size = 0;
modplug->state = MODPLUG_STATE_NEED_TUNE;
break;
- case GST_STATE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_bytestream_destroy (modplug->bs);
modplug->bs = NULL;
if (modplug->opened) {
@@ -705,16 +706,16 @@ gst_modplug_change_state (GstElement * element)
modplug->audiobuffer = NULL;
modplug->state = MODPLUG_STATE_NEED_TUNE;
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
break;
default:
break;
}
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;
}
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index c1510f0f..1803ff5f 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -82,8 +82,9 @@ static void gst_mp1videoparse_chain (GstPad * pad, GstData * _data);
static void gst_mp1videoparse_real_chain (Mp1VideoParse * mp1videoparse,
GstBuffer * buf, GstPad * outpad);
static void gst_mp1videoparse_flush (Mp1VideoParse * mp1videoparse);
-static GstElementStateReturn
-gst_mp1videoparse_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_mp1videoparse_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -543,17 +544,18 @@ gst_mp1videoparse_real_chain (Mp1VideoParse * mp1videoparse, GstBuffer * buf,
} while (mp1videoparse->partialbuf != NULL);
}
-static GstElementStateReturn
-gst_mp1videoparse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mp1videoparse_change_state (GstElement * element, GstStateChange transition)
{
Mp1VideoParse *mp1videoparse;
- g_return_val_if_fail (GST_IS_MP1VIDEOPARSE (element), GST_STATE_FAILURE);
+ g_return_val_if_fail (GST_IS_MP1VIDEOPARSE (element),
+ GST_STATE_CHANGE_FAILURE);
mp1videoparse = GST_MP1VIDEOPARSE (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_mp1videoparse_flush (mp1videoparse);
mp1videoparse->need_discont = TRUE;
mp1videoparse->width = mp1videoparse->height = -1;
@@ -564,9 +566,9 @@ gst_mp1videoparse_change_state (GstElement * element)
}
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
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 90775ea4..2602386e 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -75,7 +75,8 @@ static void gst_mp3parse_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_mp3parse_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_mp3parse_change_state (GstElement * element);
+static GstStateChangeReturn gst_mp3parse_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -529,16 +530,16 @@ gst_mp3parse_get_property (GObject * object, guint prop_id, GValue * value,
}
}
-static GstElementStateReturn
-gst_mp3parse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mp3parse_change_state (GstElement * element, GstStateChange transition)
{
GstMPEGAudioParse *src;
- GstElementStateReturn result;
+ GstStateChangeReturn result;
src = GST_MP3PARSE (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
src->channels = -1;
src->rate = -1;
src->layer = -1;
@@ -547,7 +548,7 @@ gst_mp3parse_change_state (GstElement * element)
break;
}
- result = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+ result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
return result;
}
diff --git a/gst/multifilesink/gstmultifilesink.c b/gst/multifilesink/gstmultifilesink.c
index 2372465b..4f320468 100644
--- a/gst/multifilesink/gstmultifilesink.c
+++ b/gst/multifilesink/gstmultifilesink.c
@@ -104,7 +104,7 @@ static void gst_multifilesink_chain (GstPad * pad, GstData * _data);
static void gst_multifilesink_uri_handler_init (gpointer g_iface,
gpointer iface_data);
-static GstElementStateReturn gst_multifilesink_change_state (GstElement *
+static GstStateChangeReturn gst_multifilesink_change_state (GstElement *
element);
static guint gst_multifilesink_signals[LAST_SIGNAL] = { 0 };
@@ -587,29 +587,30 @@ gst_multifilesink_chain (GstPad * pad, GstData * _data)
gst_multifilesink_signals[SIGNAL_HANDOFF], 0, filesink);
}
-static GstElementStateReturn
-gst_multifilesink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_multifilesink_change_state (GstElement * element, GstStateChange transition)
{
- g_return_val_if_fail (GST_IS_MULTIFILESINK (element), GST_STATE_FAILURE);
+ g_return_val_if_fail (GST_IS_MULTIFILESINK (element),
+ GST_STATE_CHANGE_FAILURE);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
if (GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN))
gst_multifilesink_close_file (GST_MULTIFILESINK (element));
break;
- case GST_STATE_READY_TO_PAUSED:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
if (!GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) {
if (!gst_multifilesink_open_file (GST_MULTIFILESINK (element)))
- return GST_STATE_FAILURE;
+ return GST_STATE_CHANGE_FAILURE;
}
break;
}
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;
}
/*** GSTURIHANDLER INTERFACE *************************************************/
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 16d57da6..97d1dd5f 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -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_init (GstSmoothWave * smoothwave);
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 GstPadLinkReturn gst_sw_sinklink (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
-gst_sw_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sw_change_state (GstElement * element, GstStateChange transition)
{
GstSmoothWave *sw = GST_SMOOTHWAVE (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_NULL_TO_READY:
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
break;
- case GST_STATE_READY_TO_PAUSED:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
sw->audio_basetime = GST_CLOCK_TIME_NONE;
gst_adapter_clear (sw->adapter);
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
sw->channels = 0;
break;
default:
break;
}
- return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+ return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
}
static gboolean
diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c
index f784c105..49e0cc83 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -87,7 +87,8 @@ static gboolean speed_parse_caps (GstSpeed * filter, const GstCaps * caps);
static void speed_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn speed_change_state (GstElement * element);
+static GstStateChangeReturn speed_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class; /* NULL */
@@ -471,15 +472,15 @@ speed_get_property (GObject * object, guint prop_id, GValue * value,
}
}
-static GstElementStateReturn
-speed_change_state (GstElement * element)
+static GstStateChangeReturn
+speed_change_state (GstElement * element, GstStateChange transition)
{
GstSpeed *speed = GST_SPEED (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
- case GST_STATE_READY_TO_PAUSED:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
speed->offset = 0;
speed->timestamp = 0;
speed->sample_size = 0;
@@ -489,9 +490,9 @@ speed_change_state (GstElement * element)
}
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
diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index 2612e00b..daf4b490 100644
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -256,21 +256,21 @@ gst_switch_loop (GstElement * element)
}
}
-static GstElementStateReturn
-gst_switch_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_switch_change_state (GstElement * element, GstStateChange transition)
{
GstSwitch *gstswitch;
gstswitch = GST_SWITCH (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_NULL_TO_READY:
break;
- case GST_STATE_READY_TO_PAUSED:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
{
GList *sinkpads = NULL;
@@ -292,16 +292,16 @@ gst_switch_change_state (GstElement * element)
}
}
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
break;
}
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);
else
- return GST_STATE_SUCCESS;
+ return GST_STATE_CHANGE_SUCCESS;
}
/* =========================================== */
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 6009ef7c..2af4a76c 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -107,7 +107,8 @@ static GstPadLinkReturn
gst_video_crop_link (GstPad * pad, const GstCaps * caps);
static void gst_video_crop_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_video_crop_change_state (GstElement * element);
+static GstStateChangeReturn gst_video_crop_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -531,33 +532,33 @@ gst_video_crop_chain (GstPad * pad, GstData * _data)
gst_pad_push (video_crop->srcpad, GST_DATA (outbuf));
}
-static GstElementStateReturn
-gst_video_crop_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_video_crop_change_state (GstElement * element, GstStateChange transition)
{
GstVideoCrop *video_crop;
video_crop = GST_VIDEO_CROP (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_NULL_TO_READY:
video_crop->renegotiate_src_caps = TRUE;
break;
- case GST_STATE_READY_TO_PAUSED:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
break;
}
if (parent_class->change_state != NULL)
- return parent_class->change_state (element);
+ return parent_class->change_state (element, transition);
- return GST_STATE_SUCCESS;
+ return GST_STATE_CHANGE_SUCCESS;
}
static gboolean
diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c
index 447a1bc7..352e61d5 100644
--- a/gst/videodrop/gstvideodrop.c
+++ b/gst/videodrop/gstvideodrop.c
@@ -71,7 +71,8 @@ static void gst_videodrop_set_property (GObject * object,
static void gst_videodrop_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_videodrop_change_state (GstElement * element);
+static GstStateChangeReturn gst_videodrop_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -347,13 +348,13 @@ gst_videodrop_get_property (GObject * object,
}
}
-static GstElementStateReturn
-gst_videodrop_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_videodrop_change_state (GstElement * element, GstStateChange transition)
{
GstVideodrop *videodrop = GST_VIDEODROP (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_PAUSED_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
videodrop->inited = FALSE;
videodrop->time_adjust = 0;
videodrop->total = videodrop->pass = 0;
@@ -363,9 +364,9 @@ gst_videodrop_change_state (GstElement * element)
}
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
diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c
index c70d8c84..d2e38e3a 100644
--- a/gst/y4m/gsty4mencode.c
+++ b/gst/y4m/gsty4mencode.c
@@ -68,7 +68,8 @@ static void gst_y4mencode_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec);
static void gst_y4mencode_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_y4mencode_change_state (GstElement * element);
+static GstStateChangeReturn gst_y4mencode_change_state (GstElement * element,
+ GstStateChange transition);
static GstElementClass *parent_class = NULL;
@@ -257,23 +258,23 @@ gst_y4mencode_get_property (GObject * object, guint prop_id, GValue * value,
}
}
-static GstElementStateReturn
-gst_y4mencode_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_y4mencode_change_state (GstElement * element, GstStateChange transition)
{
GstY4mEncode *filter;
- g_return_val_if_fail (GST_IS_Y4MENCODE (element), GST_STATE_FAILURE);
+ g_return_val_if_fail (GST_IS_Y4MENCODE (element), GST_STATE_CHANGE_FAILURE);
filter = GST_Y4MENCODE (element);
- if (GST_STATE_TRANSITION (element) == GST_STATE_NULL_TO_READY) {
+ if (transition == GST_STATE_CHANGE_NULL_TO_READY) {
filter->init = TRUE;
}
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