From 8274abcb69f3b8a1dcc0cddfbb59aebeaef93da6 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Wed, 30 Nov 2011 11:34:23 +0100
Subject: [PATCH] tests: More fixes for moved interfaces

---
 tests/check/Makefile.am                   | 5 +++--
 tests/check/elements/alsa.c               | 2 +-
 tests/check/elements/playbin-compressed.c | 2 +-
 tests/check/libs/gstlibscpp.cc            | 8 ++++----
 tests/check/libs/libsabi.c                | 4 ++--
 tests/check/libs/mixer.c                  | 2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 4b2b781..5183ae9 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -252,7 +252,7 @@ libs_mixer_CFLAGS = \
         $(AM_CFLAGS)
 
 libs_mixer_LDADD = \
-	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
         $(GST_BASE_LIBS) \
         $(LDADD)
 
@@ -337,6 +337,7 @@ elements_alsa_CFLAGS = \
 
 elements_alsa_LDADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
+	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
 	$(LDADD)
 
 elements_audioconvert_CFLAGS = \
@@ -362,7 +363,7 @@ elements_gdppay_LDADD = $(GST_GDP_LIBS) $(LDADD)
 elements_playbin_LDADD = $(GST_BASE_LIBS) $(LDADD)
 elements_playbin_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS)
 
-elements_playbin_compressed_LDADD = $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la $(GST_BASE_LIBS) $(LDADD)
+elements_playbin_compressed_LDADD = $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la $(GST_BASE_LIBS) $(LDADD)
 elements_playbin_compressed_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
 
 elements_decodebin_LDADD = $(GST_BASE_LIBS) $(LDADD)
diff --git a/tests/check/elements/alsa.c b/tests/check/elements/alsa.c
index ddd95c7..664b1cc 100644
--- a/tests/check/elements/alsa.c
+++ b/tests/check/elements/alsa.c
@@ -24,7 +24,7 @@
 
 #include <gst/check/gstcheck.h>
 #include <gst/interfaces/propertyprobe.h>
-#include <gst/interfaces/mixer.h>
+#include <gst/audio/mixer.h>
 
 /* just a simple test that runs device probing on
  * an alsasrc, alsasink and alsamixer instance */
diff --git a/tests/check/elements/playbin-compressed.c b/tests/check/elements/playbin-compressed.c
index c7c25f2..cdec9bb 100644
--- a/tests/check/elements/playbin-compressed.c
+++ b/tests/check/elements/playbin-compressed.c
@@ -26,7 +26,7 @@
 #include <gst/check/gstcheck.h>
 #include <gst/base/gstpushsrc.h>
 #include <gst/base/gstbasesink.h>
-#include <gst/interfaces/streamvolume.h>
+#include <gst/audio/streamvolume.h>
 
 #ifndef GST_DISABLE_REGISTRY
 
diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc
index c5c9d95..4edc275 100644
--- a/tests/check/libs/gstlibscpp.cc
+++ b/tests/check/libs/gstlibscpp.cc
@@ -40,6 +40,10 @@
 #include <gst/audio/gstaudioringbuffer.h>
 #include <gst/audio/mixerutils.h>
 #include <gst/audio/multichannel.h>
+#include <gst/audio/mixer.h>
+#include <gst/audio/mixeroptions.h>
+#include <gst/audio/mixertrack.h>
+#include <gst/audio/streamvolume.h>
 
 #include <gst/fft/gstfftf32.h>
 #include <gst/fft/gstfftf64.h>
@@ -49,12 +53,8 @@
 
 #include <gst/interfaces/interfaces-enumtypes.h>
 #include <gst/interfaces/interfaces-marshal.h>
-#include <gst/interfaces/mixer.h>
-#include <gst/interfaces/mixeroptions.h>
-#include <gst/interfaces/mixertrack.h>
 #include <gst/interfaces/navigation.h>
 #include <gst/interfaces/propertyprobe.h>
-#include <gst/interfaces/streamvolume.h>
 #include <gst/interfaces/tunerchannel.h>
 #include <gst/interfaces/tuner.h>
 #include <gst/interfaces/tunernorm.h>
diff --git a/tests/check/libs/libsabi.c b/tests/check/libs/libsabi.c
index 2ab56ae..0ee4429 100644
--- a/tests/check/libs/libsabi.c
+++ b/tests/check/libs/libsabi.c
@@ -33,15 +33,15 @@
 #include <gst/audio/gstaudiosink.h>
 #include <gst/audio/gstaudioringbuffer.h>
 #include <gst/audio/multichannel.h>
+#include <gst/audio/mixer.h>
+#include <gst/audio/streamvolume.h>
 #include <gst/fft/gstfft.h>
 #include <gst/fft/gstffts16.h>
 #include <gst/fft/gstffts32.h>
 #include <gst/fft/gstfftf32.h>
 #include <gst/fft/gstfftf64.h>
-#include <gst/interfaces/mixer.h>
 #include <gst/interfaces/navigation.h>
 #include <gst/interfaces/propertyprobe.h>
-#include <gst/interfaces/streamvolume.h>
 #include <gst/interfaces/tuner.h>
 #include <gst/pbutils/pbutils.h>
 #include <gst/riff/riff-media.h>
diff --git a/tests/check/libs/mixer.c b/tests/check/libs/mixer.c
index f1db8fe..645d321 100644
--- a/tests/check/libs/mixer.c
+++ b/tests/check/libs/mixer.c
@@ -26,7 +26,7 @@
 
 #include <gst/check/gstcheck.h>
 
-#include <gst/interfaces/mixer.h>
+#include <gst/audio/mixer.h>
 
 #include <string.h>
 
-- 
2.7.4