Mercurial > SDL_sound_CoreAudio

changeset 106:40de367eb59e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changing my include structure to do this right.
author Ryan C. Gordon <icculus@icculus.org>
date Wed, 03 Oct 2001 18:29:32 +0000
parents de42ca5599ac
children 427541211bfd
files decoders/aiff.c decoders/mod.c decoders/mp3.c decoders/ogg.c decoders/raw.c decoders/shn.c decoders/skeleton.c decoders/voc.c decoders/wav.c
diffstat 9 files changed, 74 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/decoders/aiff.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/aiff.c	Wed Oct 03 18:29:32 2001 +0000
@@ -41,10 +41,9 @@
  *  This file was written by Torbjörn Andersson. (d91tan@Update.UU.SE)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef SOUND_SUPPORTS_AIFF
 
@@ -53,7 +52,11 @@
 #include <string.h>
 #include <assert.h>
 
-#include "SDL.h"
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include "SDL_endian.h"
 
 static int AIFF_init(void);
--- a/decoders/mod.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/mod.c	Wed Oct 03 18:29:32 2001 +0000
@@ -28,10 +28,9 @@
  *  This file written by Torbjörn Andersson (d91tan@Update.UU.SE)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef SOUND_SUPPORTS_MOD
 
@@ -39,6 +38,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include "mikmod.h"
 
 
--- a/decoders/mp3.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/mp3.c	Wed Oct 03 18:29:32 2001 +0000
@@ -29,10 +29,9 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef SOUND_SUPPORTS_MP3
 
@@ -41,6 +40,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include "smpeg.h"
 #include "extra_rwops.h"
 
--- a/decoders/ogg.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/ogg.c	Wed Oct 03 18:29:32 2001 +0000
@@ -32,10 +32,9 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef SOUND_SUPPORTS_OGG
 
@@ -44,6 +43,12 @@
 #include <string.h>
 #include <math.h>
 #include <assert.h>
+
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 #include "vorbis/codec.h"
 #include "vorbis/vorbisfile.h"
 
--- a/decoders/raw.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/raw.c	Wed Oct 03 18:29:32 2001 +0000
@@ -38,10 +38,9 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef SOUND_SUPPORTS_RAW
 
@@ -50,6 +49,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 static int RAW_init(void);
 static void RAW_quit(void);
 static int RAW_open(Sound_Sample *sample, const char *ext);
--- a/decoders/shn.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/shn.c	Wed Oct 03 18:29:32 2001 +0000
@@ -41,10 +41,9 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #if (defined SOUND_SUPPORTS_SHN)
 
@@ -53,6 +52,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 
 static int SHN_init(void);
 static void SHN_quit(void);
--- a/decoders/skeleton.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/skeleton.c	Wed Oct 03 18:29:32 2001 +0000
@@ -34,10 +34,9 @@
 #error  You should base your code on this file, and remove these error lines
 #error  from your version.
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef SOUND_SUPPORTS_FMT
 
@@ -46,6 +45,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 static int FMT_init(void);
 static void FMT_quit(void);
 static int FMT_open(Sound_Sample *sample, const char *ext);
--- a/decoders/voc.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/voc.c	Wed Oct 03 18:29:32 2001 +0000
@@ -37,10 +37,9 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #if (defined SOUND_SUPPORTS_VOC)
 
@@ -49,6 +48,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 static int VOC_init(void);
 static void VOC_quit(void);
 static int VOC_open(Sound_Sample *sample, const char *ext);
--- a/decoders/wav.c	Wed Oct 03 18:17:47 2001 +0000
+++ b/decoders/wav.c	Wed Oct 03 18:29:32 2001 +0000
@@ -28,10 +28,9 @@
  *  This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
  */
 
-#include "SDL_sound.h"
-
-#define __SDL_SOUND_INTERNAL__
-#include "SDL_sound_internal.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #ifdef SOUND_SUPPORTS_WAV
 
@@ -40,6 +39,11 @@
 #include <string.h>
 #include <assert.h>
 
+#include "SDL_sound.h"
+
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
 static int WAV_init(void);
 static void WAV_quit(void);
 static int WAV_open(Sound_Sample *sample, const char *ext);