* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <gst/audio/audio.h>
-#include <gst/interfaces/streamvolume.h>
-
-#include <telepathy-glib/telepathy-glib.h>
+#include "config.h"
+#include "empathy-audio-sink.h"
-#include <libempathy-gtk/empathy-call-utils.h>
+#include <gst/audio/streamvolume.h>
-#include "empathy-audio-sink.h"
+#include "empathy-audio-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN)
"sink%d",
GST_PAD_SINK,
GST_PAD_REQUEST,
- GST_STATIC_CAPS ( GST_AUDIO_INT_PAD_TEMPLATE_CAPS " ; "
- GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS)
+ GST_STATIC_CAPS ( "audio/x-raw" )
);
enum {
static GstPad * empathy_audio_sink_request_new_pad (GstElement *self,
GstPadTemplate *templ,
- const gchar* name);
+ const gchar* name,
+ const GstCaps *caps);
static void empathy_audio_sink_release_pad (GstElement *self,
GstPad *pad);
if (sink == NULL)
return NULL;
- empathy_call_set_stream_properties (sink, self->priv->echo_cancel);
+ empathy_audio_set_stream_properties (sink, self->priv->echo_cancel);
/* Set latency (buffering on the PulseAudio side) of 40ms and transfer data
* in 10ms chunks */
static GstPad *
empathy_audio_sink_request_new_pad (GstElement *element,
GstPadTemplate *templ,
- const gchar* name)
+ const gchar* name,
+ const GstCaps *caps)
{
EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (element);
GstElement *bin, *resample, *audioconvert0, *audioconvert1;
DEBUG ("Sink echo cancellation setting: %s", echo_cancel ? "on" : "off");
sink->priv->echo_cancel = echo_cancel;
if (sink->priv->sink != NULL)
- empathy_call_set_stream_properties (sink->priv->sink,
+ empathy_audio_set_stream_properties (sink->priv->sink,
sink->priv->echo_cancel);
}