]> git.0d.be Git - empathy.git/commitdiff
There is no gstreamer-interfaces in 1.0, they are in audio/video
authorOlivier CrĂȘte <olivier.crete@collabora.com>
Tue, 11 Sep 2012 22:09:07 +0000 (18:09 -0400)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Wed, 12 Sep 2012 09:32:52 +0000 (11:32 +0200)
configure.ac
src/empathy-audio-sink.c
src/empathy-audio-src.c

index 6cd01d9b7191d5ab63c85fff6a4ecf05ef84f25e..ce3ee80df2320fc1827820b5417f0f53a6fd43e7 100644 (file)
@@ -235,6 +235,9 @@ if test "x$enable_gst1" != "xno"; then
      clutter-1.0 >= $CLUTTER_REQUIRED
      clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
      clutter-gst-2.0
+     gstreamer-1.0
+     gstreamer-audio-1.0
+     gstreamer-video-1.0
   ], have_gst1="yes", have_gst1="no")
 
   if test "x$have_gst1" = "xyes"; then
index 94fb95c4d34e49ab2fbfeafce932a0cfad7cb377..db182adb5378a05098014a560c3d4c805c280685 100644 (file)
 #include <stdlib.h>
 
 #include <gst/audio/audio.h>
+#ifdef HAVE_GST1
+#include <gst/audio/streamvolume.h>
+#else
 #include <gst/interfaces/streamvolume.h>
+#endif
 
 #include <telepathy-glib/telepathy-glib.h>
 
index 7154b4fb8c4d6788ba54d5b8d9ed401c6631d7c3..6e0ddae364951f5f5e323ba069bb037ec4ba6597 100644 (file)
 #include <stdio.h>
 #include <stdlib.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"