osxaudio: build fixes

Enable the osxaudio plugin build in configure.ac and fix some
include directive order issues.

diff --git a/configure.ac b/configure.ac
index 7056611..4d1c774 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -322,11 +322,6 @@ AG_GST_DEFAULT_ELEMENTS
 
 dnl *** plug-ins to include ***
 
-dnl Non ported plugins (non-dependant, then dependant)
-dnl Make sure you have a space before and after all plugins
-GST_PLUGINS_NONPORTED="osx_audio "
-AC_SUBST(GST_PLUGINS_NONPORTED)
-
 dnl these are all the gst plug-ins, compilable without additional libs
 dnl videofilter is at the top because others depend on it
 AG_GST_CHECK_PLUGIN(alpha)
@@ -473,7 +468,7 @@ AG_GST_CHECK_FEATURE(OSX_AUDIO, [OSX audio], osxaudio, [
     HAVE_OSX_AUDIO="yes",
     dnl *** Check for the iOS headers ***
     [AC_CHECK_HEADER(CoreAudio/CoreAudioTypes.h,
-      [HAVE_OSX_AUDIO="YES";have_ios="yes"], HAVE_OSX_AUDIO="no"
+      [HAVE_OSX_AUDIO="YES";have_ios="yes"], [HAVE_OSX_AUDIO="yes";have_ios="no"]
     )])
 ])
 if test "x$have_ios" = "xyes"; then

diff --git a/sys/osxaudio/gstosxaudioringbuffer.h b/sys/osxaudio/gstosxaudioringbuffer.h
index fa668a2..1bb6b48 100644 (file)
--- a/sys/osxaudio/gstosxaudioringbuffer.h
+++ b/sys/osxaudio/gstosxaudioringbuffer.h
@@ -50,7 +50,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gst/audio/gstaudioringbuffer.h>
+#include <gst/audio/audio.h>
 #include <gstosxcoreaudio.h>
 
 

diff --git a/sys/osxaudio/gstosxaudiosink.c b/sys/osxaudio/gstosxaudiosink.c
index 1f8c82b..52dd18c 100644 (file)
--- a/sys/osxaudio/gstosxaudiosink.c
+++ b/sys/osxaudio/gstosxaudiosink.c
@@ -67,6 +67,7 @@
 #endif
 
 #include <gst/gst.h>
+#include <gst/audio/audio.h>
 #include <gst/audio/audio-channels.h>
 #include <gst/audio/gstaudioiec61937.h>
 

diff --git a/sys/osxaudio/gstosxaudiosink.h b/sys/osxaudio/gstosxaudiosink.h
index 1ef7415..d40f516 100644 (file)
--- a/sys/osxaudio/gstosxaudiosink.h
+++ b/sys/osxaudio/gstosxaudiosink.h
@@ -51,6 +51,7 @@
 #define __GST_OSXAUDIOSINK_H__
 
 #include <gst/gst.h>
+#include <gst/audio/audio.h>
 #include <gst/audio/gstaudiobasesink.h>
 #include "gstosxaudioringbuffer.h"
 

diff --git a/sys/osxaudio/gstosxaudiosrc.h b/sys/osxaudio/gstosxaudiosrc.h
index 3f762d3..a5f5d84 100644 (file)
--- a/sys/osxaudio/gstosxaudiosrc.h
+++ b/sys/osxaudio/gstosxaudiosrc.h
@@ -45,6 +45,7 @@
 #define __GST_OSXAUDIOSRC_H__
 
 #include <gst/gst.h>
+#include <gst/audio/audio.h>
 #include <gst/audio/gstaudiobasesrc.h>
 #include "gstosxaudioringbuffer.h"