audio-src: use gst 1.0 caps format

[empathy.git] / src / empathy-audio-src.c

diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 7154b4fb8c4d6788ba54d5b8d9ed401c6631d7c3..d77968b0d39dc62a2bf5ff0ccda0c5abdde4ceaa 100644 (file)
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -19,21 +19,18 @@
  */
 
 #include "config.h"
+#include "empathy-audio-src.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <gst/interfaces/streamvolume.h>
+#include <gst/audio/streamvolume.h>
 
-#include <libempathy/empathy-utils.h>
 #include "empathy-audio-utils.h"
-
-#include "empathy-audio-src.h"
-
 #include "empathy-mic-monitor.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN)
 
@@ -248,7 +245,10 @@ create_src (void)
   /* Use pulsesrc as default */
   src = gst_element_factory_make ("pulsesrc", NULL);
   if (src == NULL)
-    return NULL;
+    {
+      g_warning ("Missing 'pulsesrc' element");
+      return NULL;
+    }
 
   empathy_audio_set_stream_properties (src, TRUE);
 
@@ -310,7 +310,6 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
   priv->volume_element = gst_element_factory_make ("volume", NULL);
   gst_bin_add (GST_BIN (obj), priv->volume_element);
 
-#ifndef HAVE_GST1
   {
     GstElement *capsfilter;
     GstCaps *caps;
@@ -320,7 +319,7 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
      * transferred and thus improving performance. When moving to GStreamer
      * 0.11/1.0, this should change so that we actually request what the encoder
      * wants downstream. */
-    caps = gst_caps_new_simple ("audio/x-raw-int",
+    caps = gst_caps_new_simple ("audio/x-raw",
         "channels", G_TYPE_INT, 1,
         "width", G_TYPE_INT, 16,
         "depth", G_TYPE_INT, 16,
@@ -332,9 +331,6 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
     gst_element_link (priv->src, capsfilter);
     gst_element_link (capsfilter, priv->volume_element);
   }
-#else
-  gst_element_link (priv->src, priv->volume_element);
-#endif
 
   src = gst_element_get_static_pad (priv->volume_element, "src");
 
@@ -621,7 +617,7 @@ empathy_audio_src_change_microphone_finish (EmpathyGstAudioSrc *src,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (src,
+  tpaw_implement_finish_void (src,
       empathy_audio_src_change_microphone_async);
 }