summaryrefslogtreecommitdiffstats
path: root/ext/flac
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2005-09-02 15:44:50 +0000
committerAndy Wingo <wingo@pobox.com>2005-09-02 15:44:50 +0000
commit7ebd7b97d480d4047051c29ad5213791b7620f6c (patch)
tree7a4cfa3c197d393d6eb23d0fbac8bee97dc6d329 /ext/flac
parente6280d445d618272800e7bd39b9e83ba82d8a4bc (diff)
All plugins updated for element state changes.
Original commit message from CVS: 2005-09-02 Andy Wingo <wingo@pobox.com> * All plugins updated for element state changes.
Diffstat (limited to 'ext/flac')
-rw-r--r--ext/flac/gstflacdec.c17
-rw-r--r--ext/flac/gstflacenc.c25
-rw-r--r--ext/flac/gstflactag.c23
3 files changed, 34 insertions, 31 deletions
diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c
index 8289bf4b..8e1c8b8b 100644
--- a/ext/flac/gstflacdec.c
+++ b/ext/flac/gstflacdec.c
@@ -48,7 +48,8 @@ static void gst_flacdec_init (FlacDec * flacdec);
static void gst_flacdec_finalize (GObject * object);
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 gboolean gst_flacdec_src_query (GstPad * pad, GstQuery * query);
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;
}
-static GstElementStateReturn
-gst_flacdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_flacdec_change_state (GstElement * element, GstStateChange transition)
{
FlacDec *flacdec = GST_FLACDEC (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_READY_TO_PAUSED:
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
flacdec->seek_pending = FALSE;
flacdec->total_samples = 0;
flacdec->eos = FALSE;
@@ -781,7 +782,7 @@ gst_flacdec_change_state (GstElement * element)
FLAC__seekable_stream_decoder_reset (flacdec->decoder);
}
break;
- case GST_STATE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
flacdec->eos = FALSE;
break;
default:
@@ -789,7 +790,7 @@ gst_flacdec_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/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c
index 3a6e809b..ab1d2cf8 100644
--- a/ext/flac/gstflacenc.c
+++ b/ext/flac/gstflacenc.c
@@ -78,7 +78,8 @@ static void gst_flacenc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_flacenc_get_property (GObject * object, guint prop_id,
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
gst_flacenc_write_callback (const FLAC__SeekableStreamEncoder * encoder,
@@ -778,21 +779,21 @@ gst_flacenc_get_property (GObject * object, guint prop_id,
}
}
-static GstElementStateReturn
-gst_flacenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_flacenc_change_state (GstElement * element, GstStateChange transition)
{
FlacEnc *flacenc = GST_FLACENC (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
- case GST_STATE_READY_TO_PAUSED:
+ switch (transition) {
+ case GST_STATE_CHANGE_NULL_TO_READY:
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
flacenc->first = TRUE;
flacenc->stopped = FALSE;
break;
- case GST_STATE_PAUSED_TO_PLAYING:
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) !=
FLAC__STREAM_ENCODER_UNINITIALIZED) {
flacenc->stopped = TRUE;
@@ -811,13 +812,13 @@ gst_flacenc_change_state (GstElement * element)
flacenc->meta = NULL;
}
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
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/ext/flac/gstflactag.c b/ext/flac/gstflactag.c
index b1572731..7acaadc5 100644
--- a/ext/flac/gstflactag.c
+++ b/ext/flac/gstflactag.c
@@ -127,7 +127,8 @@ static void gst_flac_tag_init (GstFlacTag * tag);
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;
@@ -553,24 +554,24 @@ 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)
{
GstFlacTag *tag;
tag = GST_FLAC_TAG (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:
/* do something to get out of the chain function faster */
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:
if (tag->buffer) {
gst_buffer_unref (tag->buffer);
tag->buffer = NULL;
@@ -584,9 +585,9 @@ gst_flac_tag_change_state (GstElement * element)
}
tag->state = GST_FLAC_TAG_STATE_INIT;
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
break;
}
- return parent_class->change_state (element);
+ return parent_class->change_state (element, transition);
}