[empathy] There is no gstreamer-interfaces in 1.0, they are in audio/video
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] There is no gstreamer-interfaces in 1.0, they are in audio/video
- Date: Wed, 12 Sep 2012 09:33:32 +0000 (UTC)
commit c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2
Author: Olivier CrÃte <olivier crete collabora com>
Date: Tue Sep 11 18:09:07 2012 -0400
There is no gstreamer-interfaces in 1.0, they are in audio/video
configure.ac | 3 +++
src/empathy-audio-sink.c | 4 ++++
src/empathy-audio-src.c | 4 ++++
3 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6cd01d9..ce3ee80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 94fb95c..db182ad 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -24,7 +24,11 @@
#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>
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 7154b4f..6e0ddae 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -23,7 +23,11 @@
#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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]