Mercurial > SDL_sound_CoreAudio

changeset 589:e3f029c68671

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged
author Eric Wing <ewing@anscamobile.com>
date Wed, 27 Apr 2011 19:17:13 -0700
parents eba7b2e13740 (diff) fa857159dbdf (current diff)
children 1c8414cd5839
files decoders/libmpg123/Makefile.in
diffstat 2 files changed, 14 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/decoders/coreaudio.c	Tue Apr 12 01:30:55 2011 -0400
+++ b/decoders/coreaudio.c	Wed Apr 27 19:17:13 2011 -0700
@@ -59,16 +59,20 @@
 	"mp4",
 	"m4a",
 	"aac",
+	"adts",
 	"caf",
 	"Sd2f",
 	"Sd2",
 	"au",
+	"snd",
 	"next",
 	"mp2",
 	"mp1",
 	"ac3",
 	"3gpp",
+	"3gp",
 	"3gp2",
+	"3g2",
 	"amrf",
 	"amr",
 	"ima4",
@@ -159,7 +163,7 @@
 	{
 		return kAudioFileAAC_ADTSType;
 	}
-	else if( (__Sound_strcasecmp(file_extension, "aac") == 0)
+	else if( (__Sound_strcasecmp(file_extension, "adts") == 0)
 	)
 	{
 		return kAudioFileAAC_ADTSType;
@@ -177,6 +181,7 @@
 		return kAudioFileSoundDesigner2Type;
 	}
 	else if( (__Sound_strcasecmp(file_extension, "au") == 0)
+		|| (__Sound_strcasecmp(file_extension, "snd") == 0)
 		|| (__Sound_strcasecmp(file_extension, "next") == 0)
 	)
 	{
@@ -198,11 +203,13 @@
 		return kAudioFileAC3Type;
 	}
 	else if( (__Sound_strcasecmp(file_extension, "3gpp") == 0)
+			|| (__Sound_strcasecmp(file_extension, "3gp") == 0)		
 	)
 	{
 		return kAudioFile3GPType;
 	}
 	else if( (__Sound_strcasecmp(file_extension, "3gp2") == 0)
+			|| (__Sound_strcasecmp(file_extension, "3g2") == 0)
 	)
 	{
 		return kAudioFile3GP2Type;
--- a/decoders/mpg123.c	Tue Apr 12 01:30:55 2011 -0400
+++ b/decoders/mpg123.c	Wed Apr 27 19:17:13 2011 -0700
@@ -42,14 +42,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define MPG123_NO_CONFIGURE 1
-#include "libmpg123/mpg123.h"
+#include "mpg123.h"
 
 #include "SDL_sound.h"
 
 #define __SDL_SOUND_INTERNAL__
 #include "SDL_sound_internal.h"
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
+
 static int MPG123_init(void);
 static void MPG123_quit(void);
 static int MPG123_open(Sound_Sample *sample, const char *ext);