Mercurial > SDL_sound_CoreAudio
changeset 322:31cc49d7d0ce
MacOS fixes.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 29 Apr 2002 06:12:47 +0000 |
| parents | 182fdc76060d |
| children | b5112525ebe9 |
| files | Makefile.am SDL_sound.c SDL_sound_internal.h decoders/mpglib.c decoders/mpglib/mpg123_sdlsound.h decoders/mpglib/mpglib_common.c |
| diffstat | 6 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Mon Apr 29 06:12:20 2002 +0000 +++ b/Makefile.am Mon Apr 29 06:12:47 2002 +0000 @@ -36,4 +36,5 @@ CREDITS \ COPYING \ CHANGELOG \ - CWProject.sit + CWProject.sit \ + PBProjects.tar.gz
--- a/SDL_sound.c Mon Apr 29 06:12:20 2002 +0000 +++ b/SDL_sound.c Mon Apr 29 06:12:47 2002 +0000 @@ -99,7 +99,9 @@ extern const Sound_DecoderFunctions __Sound_DecoderFunctions_FLAC; #endif - +#if (defined SOUND_SUPPORTS_QUICKTIME) +extern const Sound_DecoderFunctions __Sound_DecoderFunctions_QuickTime; +#endif typedef struct { @@ -161,6 +163,10 @@ { 0, &__Sound_DecoderFunctions_MIDI }, #endif +#if (defined SOUND_SUPPORTS_QUICKTIME) + { 0, &__Sound_DecoderFunctions_QuickTime }, +#endif + { 0, NULL } };
--- a/SDL_sound_internal.h Mon Apr 29 06:12:20 2002 +0000 +++ b/SDL_sound_internal.h Mon Apr 29 06:12:47 2002 +0000 @@ -35,7 +35,7 @@ #include "SDL.h" -#if ((defined _MSC_VER) && (!defined inline)) +#if (defined(_MSC_VER) && !defined(inline)) # define inline __inline__ #endif
--- a/decoders/mpglib.c Mon Apr 29 06:12:20 2002 +0000 +++ b/decoders/mpglib.c Mon Apr 29 06:12:47 2002 +0000 @@ -174,7 +174,7 @@ internal->decoder_private = mpg; sample->actual.rate = mpglib_freqs[mpg->mp.fr.sampling_frequency]; sample->actual.channels = mpg->mp.fr.stereo; - sample->actual.format = AUDIO_S16LSB; /* !!! FIXME: Is this right? */ + sample->actual.format = AUDIO_S16SYS; /* !!! FIXME: Is this right? */ sample->flags = SOUND_SAMPLEFLAG_NONE; return(1); /* we'll handle this data. */
--- a/decoders/mpglib/mpg123_sdlsound.h Mon Apr 29 06:12:20 2002 +0000 +++ b/decoders/mpglib/mpg123_sdlsound.h Mon Apr 29 06:12:47 2002 +0000 @@ -2,15 +2,18 @@ #include <string.h> #include <signal.h> -#ifndef WIN32 +#if !defined(WIN32) && !defined(macintosh) #include <unistd.h> #endif #include <math.h> -#ifdef _WIN32 +#if defined(_WIN32) # undef WIN32 # define WIN32 +#endif + +#if defined(WIN32) || defined(macintosh) # define M_PI 3.14159265358979323846 # define M_SQRT2 1.41421356237309504880
--- a/decoders/mpglib/mpglib_common.c Mon Apr 29 06:12:20 2002 +0000 +++ b/decoders/mpglib/mpglib_common.c Mon Apr 29 06:12:47 2002 +0000 @@ -2,10 +2,6 @@ #include <stdlib.h> #include <signal.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> - #include "SDL_sound.h" #define __SDL_SOUND_INTERNAL__