SDL_sound_CoreAudio: SDL_sound.c annotate

annotate SDL_sound.c @ 281:ad4c8f34136a

Minor formatting updates.

author	Ryan C. Gordon <icculus@icculus.org>
date	Thu, 14 Mar 2002 21:12:46 +0000
parents	6fe6de401b63
children	c97be6e1bd27

rev	line source
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	1 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	2 * SDL_sound -- An abstract sound format decoding API.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	3 * Copyright (C) 2001 Ryan C. Gordon.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	4 *
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	5 * This library is free software; you can redistribute it and/or
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	6 * modify it under the terms of the GNU Lesser General Public
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	7 * License as published by the Free Software Foundation; either
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	8 * version 2.1 of the License, or (at your option) any later version.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	9 *
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	10 * This library is distributed in the hope that it will be useful,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	13 * Lesser General Public License for more details.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	14 *
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	15 * You should have received a copy of the GNU Lesser General Public
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	16 * License along with this library; if not, write to the Free Software
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	18 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	19
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	20 /**
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	21 * This file implements the core API, which is relatively simple.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	22 * The real meat of SDL_sound is in the decoders directory.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	23 *
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	24 * Documentation is in SDL_sound.h ... It's verbose, honest. :)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	25 *
184 47cc2de2ae36 Changed reference to "LICENSE" file to "COPYING". Ryan C. Gordon <icculus@icculus.org> parents: 172 diff changeset	26 * Please see the file COPYING in the source's root directory.
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	27 *
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	28 * This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	29 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	30
107 427541211bfd config.h management updates. Ryan C. Gordon <icculus@icculus.org> parents: 102 diff changeset	31 #if HAVE_CONFIG_H
427541211bfd config.h management updates. Ryan C. Gordon <icculus@icculus.org> parents: 102 diff changeset	32 # include <config.h>
427541211bfd config.h management updates. Ryan C. Gordon <icculus@icculus.org> parents: 102 diff changeset	33 #endif
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	34
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	35 #include <stdio.h>
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	36 #include <stdlib.h>
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	37 #include <string.h>
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	38 #include <assert.h>
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	39 #include <ctype.h>
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	40
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	41 #include "SDL.h"
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	42 #include "SDL_sound.h"
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	43
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	44 #define __SDL_SOUND_INTERNAL__
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	45 #include "SDL_sound_internal.h"
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	46
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	47
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	48 /* The various decoder drivers... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	49
262 6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	50 #if (defined SOUND_SUPPORTS_SMPEG)
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	51 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SMPEG;
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	52 #endif
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	53
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	54 #if (defined SOUND_SUPPORTS_MPGLIB)
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	55 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MPGLIB;
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	56 #endif
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	57
209 e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	58 #if (defined SOUND_SUPPORTS_MIKMOD)
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	59 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MIKMOD;
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	60 #endif
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	61
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	62 #if (defined SOUND_SUPPORTS_MODPLUG)
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	63 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MODPLUG;
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	64 #endif
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	65
20 d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	66 #if (defined SOUND_SUPPORTS_WAV)
d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	67 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_WAV;
d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	68 #endif
d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	69
37 f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	70 #if (defined SOUND_SUPPORTS_AIFF)
f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	71 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_AIFF;
f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	72 #endif
f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	73
216 07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	74 #if (defined SOUND_SUPPORTS_AU)
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	75 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_AU;
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	76 #endif
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	77
26 ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	78 #if (defined SOUND_SUPPORTS_OGG)
ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	79 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_OGG;
ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	80 #endif
ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	81
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	82 #if (defined SOUND_SUPPORTS_VOC)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	83 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_VOC;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	84 #endif
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	85
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	86 #if (defined SOUND_SUPPORTS_RAW)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	87 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_RAW;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	88 #endif
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	89
102 72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	90 #if (defined SOUND_SUPPORTS_SHN)
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	91 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_SHN;
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	92 #endif
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	93
110 5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	94 #if (defined SOUND_SUPPORTS_MIDI)
5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	95 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_MIDI;
5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	96 #endif
5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	97
157 fa3e593b6a5e FLAC decoder added. Ryan C. Gordon <icculus@icculus.org> parents: 149 diff changeset	98 #if (defined SOUND_SUPPORTS_FLAC)
fa3e593b6a5e FLAC decoder added. Ryan C. Gordon <icculus@icculus.org> parents: 149 diff changeset	99 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_FLAC;
fa3e593b6a5e FLAC decoder added. Ryan C. Gordon <icculus@icculus.org> parents: 149 diff changeset	100 #endif
fa3e593b6a5e FLAC decoder added. Ryan C. Gordon <icculus@icculus.org> parents: 149 diff changeset	101
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	102
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	103
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	104 typedef struct
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	105 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	106 int available;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	107 const Sound_DecoderFunctions *funcs;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	108 } decoder_element;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	109
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	110 static decoder_element decoders[] =
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	111 {
262 6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	112 #if (defined SOUND_SUPPORTS_SMPEG)
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	113 { 0, &__Sound_DecoderFunctions_SMPEG },
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	114 #endif
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	115
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	116 #if (defined SOUND_SUPPORTS_MPGLIB)
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	117 { 0, &__Sound_DecoderFunctions_MPGLIB },
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	118 #endif
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	119
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	120 #if (defined SOUND_SUPPORTS_MODPLUG)
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	121 { 0, &__Sound_DecoderFunctions_MODPLUG },
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	122 #endif
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	123
209 e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	124 #if (defined SOUND_SUPPORTS_MIKMOD)
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	125 { 0, &__Sound_DecoderFunctions_MIKMOD },
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	126 #endif
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	127
20 d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	128 #if (defined SOUND_SUPPORTS_WAV)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	129 { 0, &__Sound_DecoderFunctions_WAV },
20 d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	130 #endif
d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	131
37 f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	132 #if (defined SOUND_SUPPORTS_AIFF)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	133 { 0, &__Sound_DecoderFunctions_AIFF },
37 f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	134 #endif
f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	135
216 07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	136 #if (defined SOUND_SUPPORTS_AU)
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	137 { 0, &__Sound_DecoderFunctions_AU },
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	138 #endif
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	139
26 ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	140 #if (defined SOUND_SUPPORTS_OGG)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	141 { 0, &__Sound_DecoderFunctions_OGG },
26 ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	142 #endif
ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	143
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	144 #if (defined SOUND_SUPPORTS_VOC)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	145 { 0, &__Sound_DecoderFunctions_VOC },
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	146 #endif
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	147
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	148 #if (defined SOUND_SUPPORTS_RAW)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	149 { 0, &__Sound_DecoderFunctions_RAW },
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	150 #endif
102 72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	151
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	152 #if (defined SOUND_SUPPORTS_SHN)
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	153 { 0, &__Sound_DecoderFunctions_SHN },
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	154 #endif
110 5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	155
163 b6d6f994e970 Moved MIDI decoder to end of array. Fixed Sound_SetError() so that it Ryan C. Gordon <icculus@icculus.org> parents: 157 diff changeset	156 #if (defined SOUND_SUPPORTS_FLAC)
b6d6f994e970 Moved MIDI decoder to end of array. Fixed Sound_SetError() so that it Ryan C. Gordon <icculus@icculus.org> parents: 157 diff changeset	157 { 0, &__Sound_DecoderFunctions_FLAC },
b6d6f994e970 Moved MIDI decoder to end of array. Fixed Sound_SetError() so that it Ryan C. Gordon <icculus@icculus.org> parents: 157 diff changeset	158 #endif
b6d6f994e970 Moved MIDI decoder to end of array. Fixed Sound_SetError() so that it Ryan C. Gordon <icculus@icculus.org> parents: 157 diff changeset	159
110 5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	160 #if (defined SOUND_SUPPORTS_MIDI)
5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	161 { 0, &__Sound_DecoderFunctions_MIDI },
5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	162 #endif
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	163
fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	164 { 0, NULL }
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	165 };
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	166
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	167
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	168
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	169 /* General SDL_sound state ... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	170
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	171 typedef struct __SOUND_ERRMSGTYPE__
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	172 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	173 Uint32 tid;
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	174 int error_available;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	175 char error_string[128];
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	176 struct __SOUND_ERRMSGTYPE__ *next;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	177 } ErrMsg;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	178
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	179 static ErrMsg *error_msgs = NULL;
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	180 static SDL_mutex *errorlist_mutex = NULL;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	181
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	182 static Sound_Sample sample_list = NULL; / this is a linked list. */
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	183 static SDL_mutex *samplelist_mutex = NULL;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	184
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	185 static const Sound_DecoderInfo **available_decoders = NULL;
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	186 static int initialized = 0;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	187
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	188
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	189 /* functions ... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	190
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	191 void Sound_GetLinkedVersion(Sound_Version *ver)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	192 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	193 if (ver != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	194 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	195 ver->major = SOUND_VER_MAJOR;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	196 ver->minor = SOUND_VER_MINOR;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	197 ver->patch = SOUND_VER_PATCH;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	198 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	199 } /* Sound_GetLinkedVersion */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	200
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	201
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	202 int Sound_Init(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	203 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	204 size_t i;
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	205 size_t pos = 0;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	206 size_t total = sizeof (decoders) / sizeof (decoders[0]);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	207 BAIL_IF_MACRO(initialized, ERR_IS_INITIALIZED, 0);
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	208
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	209 sample_list = NULL;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	210 error_msgs = NULL;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	211
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	212 available_decoders = (const Sound_DecoderInfo **)
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	213 malloc((total) * sizeof (Sound_DecoderInfo *));
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	214 BAIL_IF_MACRO(available_decoders == NULL, ERR_OUT_OF_MEMORY, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	215
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	216 SDL_Init(SDL_INIT_AUDIO);
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	217
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	218 errorlist_mutex = SDL_CreateMutex();
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	219
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	220 for (i = 0; decoders[i].funcs != NULL; i++)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	221 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	222 decoders[i].available = decoders[i].funcs->init();
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	223 if (decoders[i].available)
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	224 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	225 available_decoders[pos] = &(decoders[i].funcs->info);
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	226 pos++;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	227 } /* if */
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	228 } /* for */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	229
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	230 available_decoders[pos] = NULL;
26 ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	231
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	232 initialized = 1;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	233 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	234 } /* Sound_Init */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	235
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	236
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	237 int Sound_Quit(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	238 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	239 ErrMsg *err;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	240 ErrMsg *nexterr = NULL;
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	241 size_t i;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	242
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	243 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	244
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	245 while (((volatile Sound_Sample *) sample_list) != NULL)
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	246 Sound_FreeSample(sample_list);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	247
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	248 initialized = 0;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	249
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	250 SDL_DestroyMutex(samplelist_mutex);
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	251 samplelist_mutex = NULL;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	252 sample_list = NULL;
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	253
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	254 for (i = 0; decoders[i].funcs != NULL; i++)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	255 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	256 if (decoders[i].available)
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	257 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	258 decoders[i].funcs->quit();
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	259 decoders[i].available = 0;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	260 } /* if */
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	261 } /* for */
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	262
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	263 if (available_decoders != NULL)
80 25ee62c6b333 Fixed a const complaint from Visual C++ 6.0. Ryan C. Gordon <icculus@icculus.org> parents: 62 diff changeset	264 free((void *) available_decoders);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	265 available_decoders = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	266
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	267 /* clean up error state for each thread... */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	268 SDL_LockMutex(errorlist_mutex);
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	269 for (err = error_msgs; err != NULL; err = nexterr)
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	270 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	271 nexterr = err->next;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	272 free(err);
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	273 } /* for */
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	274 error_msgs = NULL;
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	275 SDL_UnlockMutex(errorlist_mutex);
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	276 SDL_DestroyMutex(errorlist_mutex);
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	277 errorlist_mutex = NULL;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	278
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	279 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	280 } /* Sound_Quit */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	281
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	282
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	283 const Sound_DecoderInfo **Sound_AvailableDecoders(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	284 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	285 return(available_decoders); /* READ. ONLY. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	286 } /* Sound_AvailableDecoders */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	287
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	288
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	289 static ErrMsg *findErrorForCurrentThread(void)
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	290 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	291 ErrMsg *i;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	292 Uint32 tid;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	293
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	294 if (error_msgs != NULL)
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	295 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	296 tid = SDL_ThreadID();
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	297
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	298 SDL_LockMutex(errorlist_mutex);
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	299 for (i = error_msgs; i != NULL; i = i->next)
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	300 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	301 if (i->tid == tid)
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	302 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	303 SDL_UnlockMutex(errorlist_mutex);
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	304 return(i);
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	305 } /* if */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	306 } /* for */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	307 SDL_UnlockMutex(errorlist_mutex);
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	308 } /* if */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	309
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	310 return(NULL); /* no error available. */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	311 } /* findErrorForCurrentThread */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	312
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	313
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	314 const char *Sound_GetError(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	315 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	316 const char *retval = NULL;
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	317 ErrMsg *err;
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	318
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	319 if (!initialized)
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	320 return(ERR_NOT_INITIALIZED);
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	321
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	322 err = findErrorForCurrentThread();
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	323 if ((err != NULL) && (err->error_available))
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	324 {
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	325 retval = err->error_string;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	326 err->error_available = 0;
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	327 } /* if */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	328
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	329 return(retval);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	330 } /* Sound_GetError */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	331
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	332
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	333 void Sound_ClearError(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	334 {
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	335 ErrMsg *err;
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	336
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	337 if (!initialized)
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	338 return;
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	339
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	340 err = findErrorForCurrentThread();
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	341 if (err != NULL)
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	342 err->error_available = 0;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	343 } /* Sound_ClearError */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	344
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	345
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	346 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	347 * This is declared in the internal header.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	348 */
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	349 void Sound_SetError(const char *str)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	350 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	351 ErrMsg *err;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	352
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	353 if (str == NULL)
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	354 return;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	355
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	356 SNDDBG(("Sound_SetError(\"%s\");%s\n", str,
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	357 (initialized) ? "" : " [NOT INITIALIZED!]"));
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	358
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	359 if (!initialized)
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	360 return;
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	361
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	362 err = findErrorForCurrentThread();
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	363 if (err == NULL)
165 9b26ed9eaf04 Whoops; I should read the code before I change it next time; regressing Ryan C. Gordon <icculus@icculus.org> parents: 163 diff changeset	364 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	365 err = (ErrMsg *) malloc(sizeof (ErrMsg));
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	366 if (err == NULL)
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	367 return; /* uhh...? */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	368
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	369 memset((void *) err, '\0', sizeof (ErrMsg));
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	370 err->tid = SDL_ThreadID();
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	371
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	372 SDL_LockMutex(errorlist_mutex);
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	373 err->next = error_msgs;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	374 error_msgs = err;
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	375 SDL_UnlockMutex(errorlist_mutex);
165 9b26ed9eaf04 Whoops; I should read the code before I change it next time; regressing Ryan C. Gordon <icculus@icculus.org> parents: 163 diff changeset	376 } /* if */
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	377
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	378 err->error_available = 1;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	379 strncpy(err->error_string, str, sizeof (err->error_string));
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	380 err->error_string[sizeof (err->error_string) - 1] = '\0';
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	381 } /* Sound_SetError */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	382
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	383
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	384 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	385 * -ansi and -pedantic flags prevent use of strcasecmp() on Linux, and
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	386 * I honestly don't want to mess around with figuring out if a given
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	387 * platform has "strcasecmp", "stricmp", or
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	388 * "compare_two_damned_strings_case_insensitive", which I hear is in the
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	389 * next release of Carbon. :) This is exported so decoders may use it if
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	390 * they like.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	391 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	392 int __Sound_strcasecmp(const char x, const char y)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	393 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	394 int ux, uy;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	395
98 dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	396 if (x == y) /* same pointer? Both NULL? */
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	397 return(0);
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	398
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	399 if (x == NULL)
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	400 return(-1);
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	401
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	402 if (y == NULL)
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	403 return(1);
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	404
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	405 do
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	406 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	407 ux = toupper((int) *x);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	408 uy = toupper((int) *y);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	409 if (ux > uy)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	410 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	411 else if (ux < uy)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	412 return(-1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	413 x++;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	414 y++;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	415 } while ((ux) && (uy));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	416
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	417 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	418 } /* __Sound_strcasecmp */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	419
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	420
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	421 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	422 * Allocate a Sound_Sample, and fill in most of its fields. Those that need
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	423 * to be filled in later, by a decoder, will be initialized to zero.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	424 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	425 static Sound_Sample alloc_sample(SDL_RWops rw, Sound_AudioInfo *desired,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	426 Uint32 bufferSize)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	427 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	428 Sound_Sample *retval = malloc(sizeof (Sound_Sample));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	429 Sound_SampleInternal *internal = malloc(sizeof (Sound_SampleInternal));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	430 if ((retval == NULL) \|\| (internal == NULL))
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	431 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	432 Sound_SetError(ERR_OUT_OF_MEMORY);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	433 if (retval)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	434 free(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	435 if (internal)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	436 free(internal);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	437
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	438 return(NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	439 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	440
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	441 memset(retval, '\0', sizeof (Sound_Sample));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	442 memset(internal, '\0', sizeof (Sound_SampleInternal));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	443
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	444 assert(bufferSize > 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	445 retval->buffer = malloc(bufferSize); /* pure ugly. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	446 if (!retval->buffer)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	447 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	448 Sound_SetError(ERR_OUT_OF_MEMORY);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	449 free(internal);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	450 free(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	451 return(NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	452 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	453 memset(retval->buffer, '\0', bufferSize);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	454 retval->buffer_size = bufferSize;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	455
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	456 if (desired != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	457 memcpy(&retval->desired, desired, sizeof (Sound_AudioInfo));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	458
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	459 internal->rw = rw;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	460 retval->opaque = internal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	461 return(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	462 } /* alloc_sample */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	463
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	464
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	465 #if (defined DEBUG_CHATTER)
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	466 static __inline__ const char *fmt_to_str(Uint16 fmt)
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	467 {
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	468 switch(fmt)
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	469 {
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	470 case AUDIO_U8:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	471 return("U8");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	472 case AUDIO_S8:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	473 return("S8");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	474 case AUDIO_U16LSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	475 return("U16LSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	476 case AUDIO_S16LSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	477 return("S16LSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	478 case AUDIO_U16MSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	479 return("U16MSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	480 case AUDIO_S16MSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	481 return("S16MSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	482 } /* switch */
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	483
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	484 return("Unknown");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	485 } /* fmt_to_str */
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	486 #endif
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	487
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	488
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	489 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	490 * The bulk of the Sound_NewSample() work is done here...
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	491 * Ask the specified decoder to handle the data in (rw), and if
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	492 * so, construct the Sound_Sample. Otherwise, try to wind (rw)'s stream
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	493 * back to where it was, and return false.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	494 *
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	495 * !!! FIXME: This is big, ugly, nasty, and smelly.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	496 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	497 static int init_sample(const Sound_DecoderFunctions *funcs,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	498 Sound_Sample sample, const char ext,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	499 Sound_AudioInfo *_desired)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	500 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	501 Sound_SampleInternal internal = (Sound_SampleInternal ) sample->opaque;
37 f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	502 Sound_AudioInfo desired;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	503 int pos = SDL_RWtell(internal->rw); /* !!! FIXME: Int? Really? */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	504
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	505 /* fill in the funcs for this decoder... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	506 sample->decoder = &funcs->info;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	507 internal->funcs = funcs;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	508 if (!funcs->open(sample, ext))
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	509 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	510 SDL_RWseek(internal->rw, pos, SEEK_SET); /* set for next try... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	511 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	512 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	513
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	514 /* success; we've got a decoder! */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	515
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	516 /* Now we need to set up the conversion buffer... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	517
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	518 memcpy(&desired, (_desired != NULL) ? _desired : &sample->actual,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	519 sizeof (Sound_AudioInfo));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	520
143 3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	521 if (Sound_BuildAudioCVT(&internal->sdlcvt,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	522 sample->actual.format,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	523 sample->actual.channels,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	524 sample->actual.rate,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	525 desired.format,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	526 desired.channels,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	527 desired.rate) == -1)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	528 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	529 Sound_SetError(SDL_GetError());
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	530 funcs->close(sample);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	531 SDL_RWseek(internal->rw, pos, SEEK_SET); /* set for next try... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	532 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	533 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	534
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	535 if (internal->sdlcvt.len_mult > 1)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	536 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	537 void *rc = realloc(sample->buffer,
143 3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	538 sample->buffer_size * internal->sdlcvt.len_mult);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	539 if (rc == NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	540 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	541 funcs->close(sample);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	542 SDL_RWseek(internal->rw, pos, SEEK_SET); /* set for next try... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	543 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	544 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	545
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	546 sample->buffer = rc;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	547 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	548
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	549 /* these pointers are all one and the same. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	550 memcpy(&sample->desired, &desired, sizeof (Sound_AudioInfo));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	551 internal->sdlcvt.buf = internal->buffer = sample->buffer;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	552 internal->buffer_size = sample->buffer_size / internal->sdlcvt.len_mult;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	553 internal->sdlcvt.len = internal->buffer_size;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	554
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	555 /* Prepend our new Sound_Sample to the sample_list... */
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	556 SDL_LockMutex(samplelist_mutex);
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	557 internal->next = sample_list;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	558 if (sample_list != NULL)
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	559 ((Sound_SampleInternal *) sample_list->opaque)->prev = sample;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	560 sample_list = sample;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	561 SDL_UnlockMutex(samplelist_mutex);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	562
62 b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	563 SNDDBG(("New sample DESIRED format: %s format, %d rate, %d channels.\n",
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	564 fmt_to_str(sample->desired.format),
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	565 sample->desired.rate,
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	566 sample->desired.channels));
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	567
62 b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	568 SNDDBG(("New sample ACTUAL format: %s format, %d rate, %d channels.\n",
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	569 fmt_to_str(sample->actual.format),
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	570 sample->actual.rate,
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	571 sample->actual.channels));
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	572
62 b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	573 SNDDBG(("On-the-fly conversion: %s.\n",
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	574 internal->sdlcvt.needed ? "ENABLED" : "DISABLED"));
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	575
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	576 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	577 } /* init_sample */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	578
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	579
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	580 Sound_Sample Sound_NewSample(SDL_RWops rw, const char *ext,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	581 Sound_AudioInfo *desired, Uint32 bSize)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	582 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	583 Sound_Sample *retval;
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	584 decoder_element *decoder;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	585
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	586 /* sanity checks. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	587 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	588 BAIL_IF_MACRO(rw == NULL, ERR_INVALID_ARGUMENT, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	589
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	590 retval = alloc_sample(rw, desired, bSize);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	591 if (!retval)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	592 return(NULL); /* alloc_sample() sets error message... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	593
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	594 if (ext != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	595 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	596 for (decoder = &decoders[0]; decoder->funcs != NULL; decoder++)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	597 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	598 if (decoder->available)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	599 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	600 const char **decoderExt = decoder->funcs->info.extensions;
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	601 while (*decoderExt)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	602 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	603 if (__Sound_strcasecmp(*decoderExt, ext) == 0)
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	604 {
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	605 if (init_sample(decoder->funcs, retval, ext, desired))
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	606 return(retval);
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	607 break; /* done with this decoder either way. */
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	608 } /* if */
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	609 decoderExt++;
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	610 } /* while */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	611 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	612 } /* for */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	613 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	614
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	615 /* no direct extension match? Try everything we've got... */
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	616 for (decoder = &decoders[0]; decoder->funcs != NULL; decoder++)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	617 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	618 if (decoder->available)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	619 {
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	620 int should_try = 1;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	621 const char **decoderExt = decoder->funcs->info.extensions;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	622
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	623 /* skip if we would have tried decoder above... */
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	624 while (*decoderExt)
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	625 {
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	626 if (__Sound_strcasecmp(*decoderExt, ext) == 0)
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	627 {
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	628 should_try = 0;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	629 break;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	630 } /* if */
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	631 decoderExt++;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	632 } /* while */
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	633
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	634 if (should_try)
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	635 {
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	636 if (init_sample(decoder->funcs, retval, ext, desired))
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	637 return(retval);
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	638 } /* if */
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	639 } /* if */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	640 } /* for */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	641
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	642 /* nothing could handle the sound data... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	643 free(retval->opaque);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	644 if (retval->buffer != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	645 free(retval->buffer);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	646 free(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	647 SDL_RWclose(rw);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	648 Sound_SetError(ERR_UNSUPPORTED_FORMAT);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	649 return(NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	650 } /* Sound_NewSample */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	651
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	652
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	653 Sound_Sample Sound_NewSampleFromFile(const char filename,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	654 Sound_AudioInfo *desired,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	655 Uint32 bufferSize)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	656 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	657 const char *ext;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	658 SDL_RWops *rw;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	659
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	660 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	661 BAIL_IF_MACRO(filename == NULL, ERR_INVALID_ARGUMENT, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	662
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	663 ext = strrchr(filename, '.');
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	664 rw = SDL_RWFromFile(filename, "rb");
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	665 BAIL_IF_MACRO(rw == NULL, SDL_GetError(), NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	666
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	667 if (ext != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	668 ext++;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	669
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	670 return(Sound_NewSample(rw, ext, desired, bufferSize));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	671 } /* Sound_NewSampleFromFile */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	672
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	673
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	674 void Sound_FreeSample(Sound_Sample *sample)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	675 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	676 Sound_SampleInternal *internal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	677
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	678 if (!initialized)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	679 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	680 Sound_SetError(ERR_NOT_INITIALIZED);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	681 return;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	682 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	683
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	684 if (sample == NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	685 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	686 Sound_SetError(ERR_INVALID_ARGUMENT);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	687 return;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	688 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	689
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	690 internal = (Sound_SampleInternal *) sample->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	691
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	692 SDL_LockMutex(samplelist_mutex);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	693
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	694 /* update the sample_list... */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	695 if (internal->prev != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	696 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	697 Sound_SampleInternal *prevInternal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	698 prevInternal = (Sound_SampleInternal *) internal->prev->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	699 prevInternal->next = internal->next;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	700 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	701 else
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	702 {
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	703 assert(sample_list == sample);
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	704 sample_list = internal->next;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	705 } /* else */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	706
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	707 if (internal->next != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	708 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	709 Sound_SampleInternal *nextInternal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	710 nextInternal = (Sound_SampleInternal *) internal->next->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	711 nextInternal->prev = internal->prev;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	712 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	713
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	714 SDL_UnlockMutex(samplelist_mutex);
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	715
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	716 /* nuke it... */
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	717 internal->funcs->close(sample);
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	718
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	719 if (internal->rw != NULL) /* this condition is a "just in case" thing. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	720 SDL_RWclose(internal->rw);
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	721
82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	722 if ((internal->buffer != NULL) && (internal->buffer != sample->buffer))
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	723 free(internal->buffer);
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	724
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	725 free(internal);
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	726
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	727 if (sample->buffer != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	728 free(sample->buffer);
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	729
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	730 free(sample);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	731 } /* Sound_FreeSample */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	732
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	733
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	734 int Sound_SetBufferSize(Sound_Sample *sample, Uint32 newSize)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	735 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	736 void *newBuf = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	737 Sound_SampleInternal *internal = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	738
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	739 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	740 BAIL_IF_MACRO(sample == NULL, ERR_INVALID_ARGUMENT, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	741 internal = ((Sound_SampleInternal *) sample->opaque);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	742 newBuf = realloc(sample->buffer, newSize * internal->sdlcvt.len_mult);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	743 BAIL_IF_MACRO(newBuf == NULL, ERR_OUT_OF_MEMORY, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	744
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	745 internal->sdlcvt.buf = internal->buffer = sample->buffer = newBuf;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	746 sample->buffer_size = newSize;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	747 internal->buffer_size = newSize / internal->sdlcvt.len_mult;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	748 internal->sdlcvt.len = internal->buffer_size;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	749
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	750 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	751 } /* Sound_SetBufferSize */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	752
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	753
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	754 Uint32 Sound_Decode(Sound_Sample *sample)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	755 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	756 Sound_SampleInternal *internal = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	757 Uint32 retval = 0;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	758
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	759 /* a boatload of sanity checks... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	760 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	761 BAIL_IF_MACRO(sample == NULL, ERR_INVALID_ARGUMENT, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	762 BAIL_IF_MACRO(sample->flags & SOUND_SAMPLEFLAG_ERROR, ERR_PREV_ERROR, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	763 BAIL_IF_MACRO(sample->flags & SOUND_SAMPLEFLAG_EOF, ERR_PREV_EOF, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	764
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	765 internal = (Sound_SampleInternal *) sample->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	766
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	767 assert(sample->buffer != NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	768 assert(sample->buffer_size > 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	769 assert(internal->buffer != NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	770 assert(internal->buffer_size > 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	771
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	772 /* reset EAGAIN. Decoder can flip it back on if it needs to. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	773 sample->flags &= !SOUND_SAMPLEFLAG_EAGAIN;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	774 retval = internal->funcs->read(sample);
37 f27bcbcaeab1 Added AIFF entry, and (for now) some multiple-streams-in-one-rwops support. Ryan C. Gordon <icculus@icculus.org> parents: 26 diff changeset	775
163 b6d6f994e970 Moved MIDI decoder to end of array. Fixed Sound_SetError() so that it Ryan C. Gordon <icculus@icculus.org> parents: 157 diff changeset	776 if (retval > 0 && internal->sdlcvt.needed)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	777 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	778 internal->sdlcvt.len = retval;
143 3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	779 Sound_ConvertAudio(&internal->sdlcvt);
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	780 retval = internal->sdlcvt.len_cvt;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	781 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	782
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	783 return(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	784 } /* Sound_Decode */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	785
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	786
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	787 Uint32 Sound_DecodeAll(Sound_Sample *sample)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	788 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	789 Sound_SampleInternal *internal = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	790 void *buf = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	791 Uint32 newBufSize = 0;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	792
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	793 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
172 705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	794 BAIL_IF_MACRO(sample->flags & SOUND_SAMPLEFLAG_EOF, ERR_PREV_EOF, 0);
705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	795 BAIL_IF_MACRO(sample->flags & SOUND_SAMPLEFLAG_ERROR, ERR_PREV_ERROR, 0);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	796
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	797 internal = (Sound_SampleInternal *) sample->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	798
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	799 while ( ((sample->flags & SOUND_SAMPLEFLAG_EOF) == 0) &&
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	800 ((sample->flags & SOUND_SAMPLEFLAG_ERROR) == 0) )
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	801 {
172 705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	802 Uint32 br = Sound_Decode(sample);
705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	803 void *ptr = realloc(buf, newBufSize + br);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	804 if (ptr == NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	805 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	806 sample->flags \|= SOUND_SAMPLEFLAG_ERROR;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	807 Sound_SetError(ERR_OUT_OF_MEMORY);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	808 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	809 else
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	810 {
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	811 buf = ptr;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	812 memcpy( ((char *) buf) + newBufSize, sample->buffer, br );
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	813 newBufSize += br;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	814 } /* else */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	815 } /* while */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	816
172 705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	817 if (buf == NULL) /* ...in case first call to realloc() fails... */
705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	818 return(sample->buffer_size);
705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	819
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	820 if (internal->buffer != sample->buffer)
82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	821 free(internal->buffer);
82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	822
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	823 free(sample->buffer);
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	824
82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	825 internal->sdlcvt.buf = internal->buffer = sample->buffer = buf;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	826 sample->buffer_size = newBufSize;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	827 internal->buffer_size = newBufSize / internal->sdlcvt.len_mult;
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	828 internal->sdlcvt.len = internal->buffer_size;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	829
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	830 return(newBufSize);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	831 } /* Sound_DecodeAll */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	832
223 249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	833
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	834 int Sound_Rewind(Sound_Sample *sample)
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	835 {
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	836 Sound_SampleInternal *internal;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	837 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	838
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	839 internal = (Sound_SampleInternal *) sample->opaque;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	840 if (!internal->funcs->rewind(sample))
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	841 {
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	842 sample->flags \|= SOUND_SAMPLEFLAG_ERROR;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	843 return(0);
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	844 } /* if */
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	845
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	846 sample->flags &= !SOUND_SAMPLEFLAG_EAGAIN;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	847 sample->flags &= !SOUND_SAMPLEFLAG_ERROR;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	848 sample->flags &= !SOUND_SAMPLEFLAG_EOF;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	849 return(1);
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	850 } /* Sound_Rewind */
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	851
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	852
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	853 /* end of SDL_sound.c ... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	854

Mercurial > SDL_sound_CoreAudio

annotate SDL_sound.c @ 281:ad4c8f34136a