diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2012-08-27 01:23:06 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-09-03 16:15:13 +0800 |
| commit | d641d0d903b9847864acae4a47aa948131aa50b0 (patch) | |
| tree | e089e935a5e5ad3efd1d175420fda9aa314706ba /src/empathy-audio-sink.c | |
| parent | 0af7f92b16f1d1b3527463906936fa0ea602ad57 (diff) | |
| download | gsoc2013-empathy-d641d0d903b9847864acae4a47aa948131aa50b0.tar gsoc2013-empathy-d641d0d903b9847864acae4a47aa948131aa50b0.tar.gz gsoc2013-empathy-d641d0d903b9847864acae4a47aa948131aa50b0.tar.bz2 gsoc2013-empathy-d641d0d903b9847864acae4a47aa948131aa50b0.tar.lz gsoc2013-empathy-d641d0d903b9847864acae4a47aa948131aa50b0.tar.xz gsoc2013-empathy-d641d0d903b9847864acae4a47aa948131aa50b0.tar.zst gsoc2013-empathy-d641d0d903b9847864acae4a47aa948131aa50b0.zip | |
Port to gstreamer 1.0
Diffstat (limited to 'src/empathy-audio-sink.c')
| -rw-r--r-- | src/empathy-audio-sink.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c index ba5cab77d..94fb95c4d 100644 --- a/src/empathy-audio-sink.c +++ b/src/empathy-audio-sink.c @@ -51,8 +51,12 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE( "sink%d", GST_PAD_SINK, GST_PAD_REQUEST, +#ifdef HAVE_GST1 + GST_STATIC_CAPS ( "audio/x-raw" ) +#else GST_STATIC_CAPS ( GST_AUDIO_INT_PAD_TEMPLATE_CAPS " ; " GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS) +#endif ); enum { @@ -80,9 +84,16 @@ empathy_audio_sink_init (EmpathyGstAudioSink *self) g_mutex_init (&self->priv->volume_mutex); } +#ifdef HAVE_GST1 +static GstPad * empathy_audio_sink_request_new_pad (GstElement *self, + GstPadTemplate *templ, + const gchar* name, + const GstCaps *caps); +#else static GstPad * empathy_audio_sink_request_new_pad (GstElement *self, GstPadTemplate *templ, const gchar* name); +#endif static void empathy_audio_sink_release_pad (GstElement *self, GstPad *pad); @@ -293,10 +304,18 @@ empathy_audio_sink_volume_idle_setup (gpointer user_data) return FALSE; } +#ifdef HAVE_GST1 +static GstPad * +empathy_audio_sink_request_new_pad (GstElement *element, + GstPadTemplate *templ, + const gchar* name, + const GstCaps *caps) +#else static GstPad * empathy_audio_sink_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar* name) +#endif { EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (element); GstElement *bin, *resample, *audioconvert0, *audioconvert1; |