2007-07-08 Mario Torre <neugens@limasoftware.net>

	* gnu/javax/sound/sampled/gstreamer: new package hierarchy.
	* gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java: new file.
	* gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java:
	likewise.
	* gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java: likewise.
	* gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java: likewise.
	* gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java: likewise.
	* gnu/javax/sound/AudioSecurityManager.java: likewise.
	* gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java: likewise.
	* gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java: likewise.
	* gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java: likewise.
	* gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java: likewise.
	* resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader.in:
	likewise.
	* resource/META-INF/services/javax.sound.sampled.spi.MixerProvider.in:
	likewise.
	* resource/META-INF/services/javax.sound.sampled.spi.MixerProvider:
	likewise.
	* native/jni/gstreamer-peer/gstclasspathsrc.c: likewise.
	* native/jni/gstreamer-peer/gstclasspathsrc.h: likewise.
	* native/jni/gstreamer-peer/gstinputstream.c: likewise.
	* native/jni/gstreamer-peer/gstinputstream.h: likewise.
	* native/jni/gstreamer-peer/GStreamerIOPeer.c: likewise.
	* native/jni/gstreamer-peer/Makefile.am: likewise.
	* native/jni/gstreamer-peer/.cvsignore: likewise.
	* include/gnu_javax_sound_sampled_gstreamer_io_GstAudioFileReaderNativePeer.h:
	likewise.
	* include/Makefile.am: add gstreamer generated headers.
	* configure.ac: add gstreamer sound backend configuration.
	The backend is currently disabled by default.
	* native/jni/Makefile.am: code to allow compilation of the gstreamer
	sound backend.
	* javax/sound/sampled/spi/MixerProvider.java (isMixerSupported):
	indentation fixes.
	* javax/sound/sampled/AudioFormat.java (toString): fix method to display
	informations only when available.
	* javax/sound/sampled/DataLine.java:
	(Info.isFormatSupported):  indentation fixes.
	(Info):  indentation fixes.
	(Info.toString):  indentation fixes.
	(Info.matches):  indentation fixes.

1 files changed, 55 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index 94e8c9328..aa1c989b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,11 +112,29 @@ AC_ARG_ENABLE([gconf-peer],
 AM_CONDITIONAL(CREATE_GCONF_PEER_LIBRARIES, test "x${COMPILE_GCONF_PEER}" = xyes)
 
 dnl -----------------------------------------------------------
-dnl GTK native peer error checking
+dnl GConf native peer error checking
 dnl -----------------------------------------------------------
 AC_ARG_ENABLE([gconf-peers],,AC_MSG_ERROR([No --enable-gconf-peers (or --disable-gconf-peers) option; you want --enable-gconf-peer]))
 
 dnl ------------------------------------------------------------
+dnl GStreamer based sound provider backend (disabled by default)
+dnl ------------------------------------------------------------
+AC_ARG_ENABLE([gstreamer-peer],
+              [AS_HELP_STRING(--enable-gstreamer-peer,compile GStreamer native peers (disabled by --disable-jni) [default=no])],
+              [case "${enableval}" in
+                yes) COMPILE_GSTREAMER_PEER=yes ;;
+                no) COMPILE_GSTREAMER_PEER=no ;;
+                *) COMPILE_GSTREAMER_PEER=default ;;
+              esac],
+              [COMPILE_GSTREAMER_PEER=default])
+AM_CONDITIONAL(CREATE_GSTREAMER_PEER_LIBRARIES, test "x${COMPILE_GSTREAMER_PEER}" = xyes)
+
+dnl -----------------------------------------------------------
+dnl GStreamer native peer error checking
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([gstreamer-peers],,AC_MSG_ERROR([No --enable-gstreamer-peers (or --disable-gstreamer-peers) option; you want --enable-gstreamer-peer]))
+
+dnl ------------------------------------------------------------
 dnl Whether to compile with -Werror or not (disabled by default)
 dnl ------------------------------------------------------------
 AC_ARG_ENABLE([Werror],
@@ -518,6 +536,39 @@ if test "x${COMPILE_JNI}" = xyes; then
     fi
   fi
 
+  dnl gstreamer-peer
+  if  test "x${COMPILE_GSTREAMER_PEER}" = xyes; then
+    GST_MAJORMINOR=0.10
+    GST_REQUIRED=0.10.10
+
+    dnl gstreamer
+    PKG_CHECK_MODULES(GSTREAMER, gstreamer-$GST_MAJORMINOR >= $GST_REQUIRED)
+    AC_SUBST(GSTREAMER_CFLAGS)
+    AC_SUBST(GSTREAMER_LIBS)
+
+    dnl gstreamer-base
+    PKG_CHECK_MODULES(GSTREAMER_BASE,
+                      gstreamer-base-$GST_MAJORMINOR >= $GST_REQUIRED)
+    AC_SUBST(GSTREAMER_BASE_CFLAGS)
+    AC_SUBST(GSTREAMER_BASE_LIBS)
+
+    dnl gstreamer-plugin-base
+    PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE,
+                      gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQUIRED)
+    AC_SUBST(GSTREAMER_PLUGINS_BASE_CFLAGS)
+    AC_SUBST(GSTREAMER_PLUGINS_BASE_LIBS)
+
+	GST_PLUGIN_LDFLAGS='-module -avoid-version -Wno-unused-parameter -no-undefined'
+	AC_SUBST(GST_PLUGIN_LDFLAGS)
+	
+	dnl set the gstreamer based file reader, writer and mixer
+	GSTREAMER_FILE_READER=gnu.javax.sound.sampled.gstreamer.io.GstAudioFileReader
+	GSTREAMER_MIXER_PROVIDER=gnu.javax.sound.sampled.gstreamer.GStreamerMixerProvider
+  fi
+  dnl add the gstreamer resources 
+  AC_SUBST(GSTREAMER_FILE_READER)
+  AC_SUBST(GSTREAMER_MIXER_PROVIDER)
+
   dnl Check for AWT related Qt4
   if test "x${COMPILE_QT_PEER}" = xyes; then
     PKG_CHECK_MODULES(QT, QtCore QtGui >= 4.1.0, HAVE_QT4="yes", HAVE_QT4="no")
@@ -900,6 +951,7 @@ native/jni/java-nio/Makefile
 native/jni/java-util/Makefile
 native/jni/gtk-peer/Makefile
 native/jni/gconf-peer/Makefile
+native/jni/gstreamer-peer/Makefile
 native/jni/qt-peer/Makefile
 native/jni/xmlj/Makefile
 native/jni/midi-alsa/Makefile
@@ -908,6 +960,8 @@ native/jni/native-lib/Makefile
 native/plugin/Makefile
 resource/Makefile
 resource/META-INF/services/java.util.prefs.PreferencesFactory
+resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader
+resource/META-INF/services/javax.sound.sampled.spi.MixerProvider
 scripts/Makefile
 scripts/classpath.spec
 lib/Makefile