diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
| commit | 012dfb8b33969b582f9132ac9f95402b3098ff43 (patch) | |
| tree | acff4df23e44c9d15abab2b9877c3f72032da286 /gst/festival/gstfestival.c | |
| parent | 390621f8de27467709897c92e5fec4605d96be75 (diff) | |
| download | gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.tar.gz gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.tar.bz2 gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.zip | |
Fix up all the state change functions.
Original commit message from CVS:
Fix up all the state change functions.
Diffstat (limited to 'gst/festival/gstfestival.c')
| -rw-r--r-- | gst/festival/gstfestival.c | 15 |
1 files changed, 8 insertions, 7 deletions
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 |