remove released flag

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

diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 2f919533ecf0b178addf9fe40110332cbfa20fb2..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 <tp-account-widgets/tpaw-utils.h>
 
-#ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
-#else
-#include <gst/interfaces/streamvolume.h>
-#endif
 
-#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)
 
@@ -313,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;
@@ -323,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,
@@ -335,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");
 
@@ -624,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);
 }