summaryrefslogtreecommitdiffstats
path: root/sys/osxaudio
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 /sys/osxaudio
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 'sys/osxaudio')
-rw-r--r--sys/osxaudio/gstosxaudioelement.c19
-rw-r--r--sys/osxaudio/gstosxaudiosink.c20
-rw-r--r--sys/osxaudio/gstosxaudiosrc.c21
3 files changed, 30 insertions, 30 deletions
diff --git a/sys/osxaudio/gstosxaudioelement.c b/sys/osxaudio/gstosxaudioelement.c
index 5295d374..0fd66dc7 100644
--- a/sys/osxaudio/gstosxaudioelement.c
+++ b/sys/osxaudio/gstosxaudioelement.c
@@ -56,7 +56,7 @@ static void gst_osxaudioelement_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_osxaudioelement_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_osxaudioelement_change_state (GstElement *
+static GstStateChangeReturn gst_osxaudioelement_change_state (GstElement *
element);
static GstElementClass *parent_class = NULL;
@@ -411,8 +411,9 @@ gst_osxaudioelement_get_property (GObject * object,
}
}
-static GstElementStateReturn
-gst_osxaudioelement_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_osxaudioelement_change_state (GstElement * element,
+ GstStateChange transition)
{
GstOsxAudioElement *osxaudio = GST_OSXAUDIOELEMENT (element);
const GList *padlist;
@@ -426,14 +427,14 @@ gst_osxaudioelement_change_state (GstElement * element)
input = FALSE;
}
}
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_NULL_TO_READY:
+ switch (transition) {
+ case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_osxaudioelement_open_audio (osxaudio, input)) {
- return GST_STATE_FAILURE;
+ return GST_STATE_CHANGE_FAILURE;
}
GST_INFO ("osxaudioelement: opened sound device");
break;
- case GST_STATE_READY_TO_NULL:
+ case GST_STATE_CHANGE_READY_TO_NULL:
gst_osxaudioelement_close_audio (osxaudio, input);
GST_INFO ("osxaudioelement: closed sound device");
break;
@@ -442,7 +443,7 @@ gst_osxaudioelement_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/sys/osxaudio/gstosxaudiosink.c b/sys/osxaudio/gstosxaudiosink.c
index 3450563f..593335e3 100644
--- a/sys/osxaudio/gstosxaudiosink.c
+++ b/sys/osxaudio/gstosxaudiosink.c
@@ -42,7 +42,7 @@ static void gst_osxaudiosink_class_init (GstOsxAudioSinkClass * klass);
static void gst_osxaudiosink_init (GstOsxAudioSink * osxaudiosink);
static void gst_osxaudiosink_dispose (GObject * object);
-static GstElementStateReturn gst_osxaudiosink_change_state (GstElement *
+static GstStateChangeReturn gst_osxaudiosink_change_state (GstElement *
element);
static void gst_osxaudiosink_chain (GstPad * pad, GstData * _data);
@@ -191,39 +191,39 @@ gst_osxaudiosink_chain (GstPad * pad, GstData * _data)
gst_buffer_unref (buf);
}
-static GstElementStateReturn
-gst_osxaudiosink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_osxaudiosink_change_state (GstElement * element, GstStateChange transition)
{
GstOsxAudioSink *osxaudiosink;
OSErr status;
osxaudiosink = GST_OSXAUDIOSINK (element);
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_READY_TO_PAUSED:
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
break;
- case GST_STATE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
status =
AudioDeviceStart (GST_OSXAUDIOELEMENT (osxaudiosink)->device_id,
outputAudioDeviceIOProc);
if (status)
GST_DEBUG ("AudioDeviceStart returned %d\n", (int) status);
break;
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
status =
AudioDeviceStop (GST_OSXAUDIOELEMENT (osxaudiosink)->device_id,
outputAudioDeviceIOProc);
if (status)
GST_DEBUG ("AudioDeviceStop returned %d\n", (int) status);
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
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/sys/osxaudio/gstosxaudiosrc.c b/sys/osxaudio/gstosxaudiosrc.c
index 542887d1..94877ef5 100644
--- a/sys/osxaudio/gstosxaudiosrc.c
+++ b/sys/osxaudio/gstosxaudiosrc.c
@@ -63,8 +63,7 @@ static void gst_osxaudiosrc_class_init (GstOsxAudioSrcClass * klass);
static void gst_osxaudiosrc_init (GstOsxAudioSrc * osxaudiosrc);
static void gst_osxaudiosrc_dispose (GObject * object);
-static GstElementStateReturn gst_osxaudiosrc_change_state (GstElement *
- element);
+static GstStateChangeReturn gst_osxaudiosrc_change_state (GstElement * element);
static GstData *gst_osxaudiosrc_get (GstPad * pad);
@@ -178,40 +177,40 @@ gst_osxaudiosrc_get (GstPad * pad)
return GST_DATA (buf);
}
-static GstElementStateReturn
-gst_osxaudiosrc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_osxaudiosrc_change_state (GstElement * element, GstStateChange transition)
{
GstOsxAudioSrc *osxaudiosrc = GST_OSXAUDIOSRC (element);
OSErr status;
GST_DEBUG ("osxaudiosrc: state change");
- switch (GST_STATE_TRANSITION (element)) {
- case GST_STATE_READY_TO_PAUSED:
+ switch (transition) {
+ case GST_STATE_CHANGE_READY_TO_PAUSED:
osxaudiosrc->curoffset = 0;
break;
- case GST_STATE_PAUSED_TO_PLAYING:
+ case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
status =
AudioDeviceStart (GST_OSXAUDIOELEMENT (osxaudiosrc)->device_id,
inputAudioDeviceIOProc);
if (status)
GST_DEBUG ("AudioDeviceStart returned %d\n", (int) status);
break;
- case GST_STATE_PLAYING_TO_PAUSED:
+ case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
status =
AudioDeviceStop (GST_OSXAUDIOELEMENT (osxaudiosrc)->device_id,
inputAudioDeviceIOProc);
if (status)
GST_DEBUG ("AudioDeviceStop returned %d\n", (int) status);
break;
- case GST_STATE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:
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;
}