esound r504 - trunk

[jmouette svn gnome org]

Author: jmouette
Date: Tue Nov 18 19:46:20 2008
New Revision: 504
URL: http://svn.gnome.org/viewvc/esound?rev=504&view=rev

Log:
        * esdfile.c: (esd_play_file): accept file formats supported by
        libaudiofile.
        * configure.ac: require libaudiofile 0.2.3 which adds support  
        for them.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/esdfile.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Nov 18 19:46:20 2008
@@ -362,7 +362,7 @@
 
 build_esdplay=false
 
-PKG_CHECK_MODULES(AUDIOFILE, [audiofile >= 0.1.5])
+PKG_CHECK_MODULES(AUDIOFILE, [audiofile >= 0.2.3])
 
 CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS"
 LIBS="$LIBS $AUDIOFILE_LIBS"

Modified: trunk/esdfile.c
==============================================================================
--- trunk/esdfile.c	(original)
+++ trunk/esdfile.c	Tue Nov 18 19:46:20 2008
@@ -69,7 +69,11 @@
 
     /* This check was added because audiofile doesn't tell us whether or
      * not it will play compressed audio correctly. */
-    if ( in_compression != AF_COMPRESSION_NONE )
+    if ( in_compression != AF_COMPRESSION_NONE &&
+	 in_compression != AF_COMPRESSION_G711_ULAW &&
+	 in_compression != AF_COMPRESSION_G711_ALAW &&
+	 in_compression != AF_COMPRESSION_IMA &&
+	 in_compression != AF_COMPRESSION_MS_ADPCM)
     {
 	/* fputs ("compressed audio not supported supported\n", stderr); */
 	return 0;