diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2012-09-12 06:09:07 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-09-12 17:32:52 +0800 |
| commit | c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2 (patch) | |
| tree | 691e447f358b5658b1d56677d60e4feae0fbcb46 | |
| parent | 873b2ab2ce7dc26cb72e99ffafb0140c8a662fef (diff) | |
| download | gsoc2013-empathy-c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2.tar gsoc2013-empathy-c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2.tar.gz gsoc2013-empathy-c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2.tar.bz2 gsoc2013-empathy-c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2.tar.lz gsoc2013-empathy-c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2.tar.xz gsoc2013-empathy-c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2.tar.zst gsoc2013-empathy-c2942d6fbbceae66540cc7b49ff3b39e87e7b3b2.zip | |
There is no gstreamer-interfaces in 1.0, they are in audio/video
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/empathy-audio-sink.c | 4 | ||||
| -rw-r--r-- | src/empathy-audio-src.c | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 6cd01d9b7..ce3ee80df 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 94fb95c4d..db182adb5 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 7154b4fb8..6e0ddae36 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" |