SDL_sound_CoreAudio: SDL_sound.c annotate

annotate SDL_sound.c @ 443:30f96c853462

MacOS X build fixes.

author	Ryan C. Gordon <icculus@icculus.org>
date	Fri, 31 Jan 2003 05:17:46 +0000
parents	5b00e43ec23c
children	d0393837bfac

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 <ctype.h>
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	39
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	40 #include "SDL.h"
441 5b00e43ec23c Patches to make SDL_sound more Visual C happy. Ryan C. Gordon <icculus@icculus.org> parents: 432 diff changeset	41 #include "SDL_thread.h"
4 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
322 31cc49d7d0ce MacOS fixes. Ryan C. Gordon <icculus@icculus.org> parents: 311 diff changeset	102 #if (defined SOUND_SUPPORTS_QUICKTIME)
31cc49d7d0ce MacOS fixes. Ryan C. Gordon <icculus@icculus.org> parents: 311 diff changeset	103 extern const Sound_DecoderFunctions __Sound_DecoderFunctions_QuickTime;
31cc49d7d0ce MacOS fixes. Ryan C. Gordon <icculus@icculus.org> parents: 311 diff changeset	104 #endif
48 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 typedef struct
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	107 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	108 int available;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	109 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	110 } decoder_element;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	111
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	112 static decoder_element decoders[] =
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	113 {
262 6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	114 #if (defined SOUND_SUPPORTS_SMPEG)
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	115 { 0, &__Sound_DecoderFunctions_SMPEG },
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	116 #endif
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	117
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	118 #if (defined SOUND_SUPPORTS_MPGLIB)
6fe6de401b63 mpglib support. Ryan C. Gordon <icculus@icculus.org> parents: 237 diff changeset	119 { 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	120 #endif
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	121
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	122 #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	123 { 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	124 #endif
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	125
209 e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	126 #if (defined SOUND_SUPPORTS_MIKMOD)
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	127 { 0, &__Sound_DecoderFunctions_MIKMOD },
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	128 #endif
e63b9393f6ce Added ModPlug support. Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	129
20 d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	130 #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	131 { 0, &__Sound_DecoderFunctions_WAV },
20 d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	132 #endif
d4ac6ce1360e Added WAV entries. Ryan C. Gordon <icculus@icculus.org> parents: 10 diff changeset	133
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 #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	135 { 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	136 #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	137
216 07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	138 #if (defined SOUND_SUPPORTS_AU)
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	139 { 0, &__Sound_DecoderFunctions_AU },
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	140 #endif
07d0939d40e7 Support for .AU files added. Ryan C. Gordon <icculus@icculus.org> parents: 209 diff changeset	141
26 ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	142 #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	143 { 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	144 #endif
ddc3614c9042 Bugfix (thanks Tsuyoshi Iguchi!), and Ogg Vorbis decoder entry. Ryan C. Gordon <icculus@icculus.org> parents: 20 diff changeset	145
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	146 #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	147 { 0, &__Sound_DecoderFunctions_VOC },
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	148 #endif
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	149
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	150 #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	151 { 0, &__Sound_DecoderFunctions_RAW },
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	152 #endif
102 72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	153
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	154 #if (defined SOUND_SUPPORTS_SHN)
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	155 { 0, &__Sound_DecoderFunctions_SHN },
72502bed0aef Added SHN entry. Ryan C. Gordon <icculus@icculus.org> parents: 98 diff changeset	156 #endif
110 5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	157
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	158 #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	159 { 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	160 #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	161
110 5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	162 #if (defined SOUND_SUPPORTS_MIDI)
5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	163 { 0, &__Sound_DecoderFunctions_MIDI },
5e5adbe0f215 Added Midi decoder. Ryan C. Gordon <icculus@icculus.org> parents: 107 diff changeset	164 #endif
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	165
322 31cc49d7d0ce MacOS fixes. Ryan C. Gordon <icculus@icculus.org> parents: 311 diff changeset	166 #if (defined SOUND_SUPPORTS_QUICKTIME)
31cc49d7d0ce MacOS fixes. Ryan C. Gordon <icculus@icculus.org> parents: 311 diff changeset	167 { 0, &__Sound_DecoderFunctions_QuickTime },
31cc49d7d0ce MacOS fixes. Ryan C. Gordon <icculus@icculus.org> parents: 311 diff changeset	168 #endif
31cc49d7d0ce MacOS fixes. Ryan C. Gordon <icculus@icculus.org> parents: 311 diff changeset	169
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	170 { 0, NULL }
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	171 };
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	172
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	173
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	174
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	175 /* General SDL_sound state ... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	176
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	177 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	178 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	179 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	180 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	181 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	182 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	183 } ErrMsg;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	184
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	185 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	186 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	187
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	188 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	189 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	190
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	191 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	192 static int initialized = 0;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	193
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 /* functions ... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	196
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	197 void Sound_GetLinkedVersion(Sound_Version *ver)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	198 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	199 if (ver != NULL)
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 ver->major = SOUND_VER_MAJOR;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	202 ver->minor = SOUND_VER_MINOR;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	203 ver->patch = SOUND_VER_PATCH;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	204 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	205 } /* Sound_GetLinkedVersion */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	206
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	207
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	208 int Sound_Init(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	209 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	210 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	211 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	212 size_t total = sizeof (decoders) / sizeof (decoders[0]);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	213 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	214
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	215 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	216 error_msgs = NULL;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	217
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	218 available_decoders = (const Sound_DecoderInfo **)
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	219 malloc((total) * sizeof (Sound_DecoderInfo *));
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	220 BAIL_IF_MACRO(available_decoders == NULL, ERR_OUT_OF_MEMORY, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	221
432 ddce7101673e Call SDL_InitSubSystem instead of SDL_Init, to prevent unwanted initialization Ryan C. Gordon <icculus@icculus.org> parents: 400 diff changeset	222 SDL_InitSubSystem(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	223
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	224 errorlist_mutex = SDL_CreateMutex();
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	225
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	226 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	227 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	228 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	229 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	230 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	231 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	232 pos++;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	233 } /* if */
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	234 } /* for */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	235
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	236 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	237
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	238 initialized = 1;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	239 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	240 } /* Sound_Init */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	241
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	242
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	243 int Sound_Quit(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	244 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	245 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	246 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	247 size_t i;
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	248
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	249 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	250
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	251 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	252 Sound_FreeSample(sample_list);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	253
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	254 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	255
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	256 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	257 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	258 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	259
118 fd942c1433f8 Fixed for win32 compile. Ryan C. Gordon <icculus@icculus.org> parents: 110 diff changeset	260 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	261 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	262 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	263 {
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	264 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	265 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	266 } /* if */
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	267 } /* for */
c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	268
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	269 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	270 free((void *) available_decoders);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	271 available_decoders = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	272
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	273 /* 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	274 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	275 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	276 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	277 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	278 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	279 } /* 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	280 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	281 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	282 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	283 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	284
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	285 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	286 } /* Sound_Quit */
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
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	289 const Sound_DecoderInfo **Sound_AvailableDecoders(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	290 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	291 return(available_decoders); /* READ. ONLY. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	292 } /* Sound_AvailableDecoders */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	293
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	294
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 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	296 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	297 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	298 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	299
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	300 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	301 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	302 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	303
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	304 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	305 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	306 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	307 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	308 {
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	309 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	310 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	311 } /* if */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	312 } /* for */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	313 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	314 } /* if */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	315
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	316 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	317 } /* findErrorForCurrentThread */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	318
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	319
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	320 const char *Sound_GetError(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	321 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	322 const char *retval = NULL;
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	323 ErrMsg *err;
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	324
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	325 if (!initialized)
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	326 return(ERR_NOT_INITIALIZED);
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	327
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	328 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	329 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	330 {
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	331 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	332 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	333 } /* if */
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	334
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	335 return(retval);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	336 } /* Sound_GetError */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	337
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	338
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	339 void Sound_ClearError(void)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	340 {
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	341 ErrMsg *err;
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	342
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	343 if (!initialized)
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	344 return;
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	345
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	346 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	347 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	348 err->error_available = 0;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	349 } /* Sound_ClearError */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	350
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	351
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	352 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	353 * This is declared in the internal header.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	354 */
306 c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	355 void __Sound_SetError(const char *str)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	356 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	357 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	358
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	359 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	360 return;
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	361
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	362 SNDDBG(("__Sound_SetError(\"%s\");%s\n", str,
226 57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	363 (initialized) ? "" : " [NOT INITIALIZED!]"));
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	364
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	365 if (!initialized)
57e16a6d244f Fixed an incorrect assertion. Ryan C. Gordon <icculus@icculus.org> parents: 223 diff changeset	366 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	367
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	368 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	369 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	370 {
219 ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	371 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	372 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	373 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	374
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	375 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	376 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	377
ca3483f4cfec Error message management now keeps state per-thread, and does not use Ryan C. Gordon <icculus@icculus.org> parents: 216 diff changeset	378 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	379 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	380 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	381 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	382 } /* 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	383
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	384 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	385 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	386 err->error_string[sizeof (err->error_string) - 1] = '\0';
306 c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	387 } /* __Sound_SetError */
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	388
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	389
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	390 Uint32 __Sound_convertMsToBytePos(Sound_AudioInfo *info, Uint32 ms)
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	391 {
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	392 /* "frames" == "sample frames" */
441 5b00e43ec23c Patches to make SDL_sound more Visual C happy. Ryan C. Gordon <icculus@icculus.org> parents: 432 diff changeset	393 float frames_per_ms = ((float) info->rate) / 1000.0f;
306 c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	394 Uint32 frame_offset = (Uint32) (frames_per_ms * ((float) ms));
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	395 Uint32 frame_size = (Uint32) ((info->format & 0xFF) / 8) * info->channels;
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	396 return(frame_offset * frame_size);
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	397 } /* __Sound_convertMsToBytePos */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	398
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	399
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	400 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	401 * -ansi and -pedantic flags prevent use of strcasecmp() on Linux, and
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	402 * 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	403 * platform has "strcasecmp", "stricmp", or
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	404 * "compare_two_damned_strings_case_insensitive", which I hear is in the
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	405 * 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	406 * they like.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	407 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	408 int __Sound_strcasecmp(const char x, const char y)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	409 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	410 int ux, uy;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	411
98 dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	412 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	413 return(0);
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	414
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	415 if (x == NULL)
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	416 return(-1);
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	417
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	418 if (y == NULL)
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	419 return(1);
dfdf7b4e05bd Changed __Sound_strcasecmp() to handle NULL strings gracefully. Ryan C. Gordon <icculus@icculus.org> parents: 80 diff changeset	420
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	421 do
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	422 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	423 ux = toupper((int) *x);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	424 uy = toupper((int) *y);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	425 if (ux > uy)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	426 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	427 else if (ux < uy)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	428 return(-1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	429 x++;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	430 y++;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	431 } while ((ux) && (uy));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	432
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	433 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	434 } /* __Sound_strcasecmp */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	435
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	436
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 * 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	439 * 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	440 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	441 static Sound_Sample alloc_sample(SDL_RWops rw, Sound_AudioInfo *desired,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	442 Uint32 bufferSize)
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 Sound_Sample *retval = malloc(sizeof (Sound_Sample));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	445 Sound_SampleInternal *internal = malloc(sizeof (Sound_SampleInternal));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	446 if ((retval == NULL) \|\| (internal == NULL))
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	447 {
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	448 __Sound_SetError(ERR_OUT_OF_MEMORY);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	449 if (retval)
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 if (internal)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	452 free(internal);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	453
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	454 return(NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	455 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	456
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	457 memset(retval, '\0', sizeof (Sound_Sample));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	458 memset(internal, '\0', sizeof (Sound_SampleInternal));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	459
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	460 assert(bufferSize > 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	461 retval->buffer = malloc(bufferSize); /* pure ugly. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	462 if (!retval->buffer)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	463 {
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	464 __Sound_SetError(ERR_OUT_OF_MEMORY);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	465 free(internal);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	466 free(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	467 return(NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	468 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	469 memset(retval->buffer, '\0', bufferSize);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	470 retval->buffer_size = bufferSize;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	471
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	472 if (desired != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	473 memcpy(&retval->desired, desired, sizeof (Sound_AudioInfo));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	474
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	475 internal->rw = rw;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	476 retval->opaque = internal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	477 return(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	478 } /* alloc_sample */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	479
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	480
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	481 #if (defined DEBUG_CHATTER)
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	482 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	483 {
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	484 switch(fmt)
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	485 {
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	486 case AUDIO_U8:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	487 return("U8");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	488 case AUDIO_S8:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	489 return("S8");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	490 case AUDIO_U16LSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	491 return("U16LSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	492 case AUDIO_S16LSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	493 return("S16LSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	494 case AUDIO_U16MSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	495 return("U16MSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	496 case AUDIO_S16MSB:
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	497 return("S16MSB");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	498 } /* switch */
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	499
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	500 return("Unknown");
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	501 } /* fmt_to_str */
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	502 #endif
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	503
cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	504
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	505 /*
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	506 * The bulk of the Sound_NewSample() work is done here...
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	507 * Ask the specified decoder to handle the data in (rw), and if
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	508 * so, construct the Sound_Sample. Otherwise, try to wind (rw)'s stream
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	509 * back to where it was, and return false.
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	510 */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	511 static int init_sample(const Sound_DecoderFunctions *funcs,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	512 Sound_Sample sample, const char ext,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	513 Sound_AudioInfo *_desired)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	514 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	515 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	516 Sound_AudioInfo desired;
400 9d0b5ec9cc26 FIXME cleanups. Ryan C. Gordon <icculus@icculus.org> parents: 387 diff changeset	517 int pos = SDL_RWtell(internal->rw);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	518
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	519 /* fill in the funcs for this decoder... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	520 sample->decoder = &funcs->info;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	521 internal->funcs = funcs;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	522 if (!funcs->open(sample, ext))
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	523 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	524 SDL_RWseek(internal->rw, pos, SEEK_SET); /* set for next try... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	525 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	526 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	527
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	528 /* success; we've got a decoder! */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	529
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	530 /* Now we need to set up the conversion buffer... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	531
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	532 memcpy(&desired, (_desired != NULL) ? _desired : &sample->actual,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	533 sizeof (Sound_AudioInfo));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	534
340 5a72981b8cba Added optional, experimental audio conversion routines by Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 322 diff changeset	535 if (desired.format == 0)
5a72981b8cba Added optional, experimental audio conversion routines by Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 322 diff changeset	536 desired.format = sample->actual.format;
5a72981b8cba Added optional, experimental audio conversion routines by Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 322 diff changeset	537 if (desired.channels == 0)
5a72981b8cba Added optional, experimental audio conversion routines by Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 322 diff changeset	538 desired.channels = sample->actual.channels;
5a72981b8cba Added optional, experimental audio conversion routines by Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 322 diff changeset	539 if (desired.rate == 0)
5a72981b8cba Added optional, experimental audio conversion routines by Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 322 diff changeset	540 desired.rate = sample->actual.rate;
5a72981b8cba Added optional, experimental audio conversion routines by Frank Ranostaj. Ryan C. Gordon <icculus@icculus.org> parents: 322 diff changeset	541
143 3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	542 if (Sound_BuildAudioCVT(&internal->sdlcvt,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	543 sample->actual.format,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	544 sample->actual.channels,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	545 sample->actual.rate,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	546 desired.format,
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	547 desired.channels,
382 ce998ee6194f Sync'd with latest altcvt. Ryan C. Gordon <icculus@icculus.org> parents: 377 diff changeset	548 desired.rate,
ce998ee6194f Sync'd with latest altcvt. Ryan C. Gordon <icculus@icculus.org> parents: 377 diff changeset	549 sample->buffer_size) == -1)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	550 {
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	551 __Sound_SetError(SDL_GetError());
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	552 funcs->close(sample);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	553 SDL_RWseek(internal->rw, pos, SEEK_SET); /* set for next try... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	554 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	555 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	556
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	557 if (internal->sdlcvt.len_mult > 1)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	558 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	559 void *rc = realloc(sample->buffer,
143 3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	560 sample->buffer_size * internal->sdlcvt.len_mult);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	561 if (rc == NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	562 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	563 funcs->close(sample);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	564 SDL_RWseek(internal->rw, pos, SEEK_SET); /* set for next try... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	565 return(0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	566 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	567
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	568 sample->buffer = rc;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	569 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	570
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	571 /* these pointers are all one and the same. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	572 memcpy(&sample->desired, &desired, sizeof (Sound_AudioInfo));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	573 internal->sdlcvt.buf = internal->buffer = sample->buffer;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	574 internal->buffer_size = sample->buffer_size / internal->sdlcvt.len_mult;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	575 internal->sdlcvt.len = internal->buffer_size;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	576
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	577 /* 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	578 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	579 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	580 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	581 ((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	582 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	583 SDL_UnlockMutex(samplelist_mutex);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	584
62 b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	585 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	586 fmt_to_str(sample->desired.format),
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	587 sample->desired.rate,
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	588 sample->desired.channels));
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	589
62 b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	590 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	591 fmt_to_str(sample->actual.format),
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	592 sample->actual.rate,
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	593 sample->actual.channels));
10 cc2c32349380 Some debugging output, and MP3 and VOC entries, added. Ryan C. Gordon <icculus@icculus.org> parents: 4 diff changeset	594
62 b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	595 SNDDBG(("On-the-fly conversion: %s.\n",
b13fafb976be Changed _D macro to DBGSND. Ryan C. Gordon <icculus@icculus.org> parents: 48 diff changeset	596 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	597
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	598 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	599 } /* init_sample */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	600
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	601
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	602 Sound_Sample Sound_NewSample(SDL_RWops rw, const char *ext,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	603 Sound_AudioInfo *desired, Uint32 bSize)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	604 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	605 Sound_Sample *retval;
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	606 decoder_element *decoder;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	607
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	608 /* sanity checks. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	609 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	610 BAIL_IF_MACRO(rw == NULL, ERR_INVALID_ARGUMENT, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	611
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	612 retval = alloc_sample(rw, desired, bSize);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	613 if (!retval)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	614 return(NULL); /* alloc_sample() sets error message... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	615
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	616 if (ext != NULL)
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 for (decoder = &decoders[0]; decoder->funcs != NULL; decoder++)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	619 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	620 if (decoder->available)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	621 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	622 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	623 while (*decoderExt)
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	624 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	625 if (__Sound_strcasecmp(*decoderExt, ext) == 0)
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	626 {
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	627 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	628 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	629 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	630 } /* if */
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	631 decoderExt++;
1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	632 } /* while */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	633 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	634 } /* for */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	635 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	636
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	637 /* 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	638 for (decoder = &decoders[0]; decoder->funcs != NULL; decoder++)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	639 {
149 1df5c106504e Decoders can now list multiple file extensions. Ryan C. Gordon <icculus@icculus.org> parents: 143 diff changeset	640 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	641 {
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	642 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	643 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	644
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	645 /* 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	646 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	647 {
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	648 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	649 {
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	650 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	651 break;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	652 } /* if */
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	653 decoderExt++;
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	654 } /* while */
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	655
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	656 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	657 {
ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	658 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	659 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	660 } /* if */
48 c4b8c39a9798 Individual decoders are now initialized during Sound_Init(), and deinitialized Ryan C. Gordon <icculus@icculus.org> parents: 37 diff changeset	661 } /* if */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	662 } /* for */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	663
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	664 /* nothing could handle the sound data... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	665 free(retval->opaque);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	666 if (retval->buffer != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	667 free(retval->buffer);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	668 free(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	669 SDL_RWclose(rw);
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	670 __Sound_SetError(ERR_UNSUPPORTED_FORMAT);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	671 return(NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	672 } /* Sound_NewSample */
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
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	675 Sound_Sample Sound_NewSampleFromFile(const char filename,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	676 Sound_AudioInfo *desired,
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	677 Uint32 bufferSize)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	678 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	679 const char *ext;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	680 SDL_RWops *rw;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	681
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	682 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	683 BAIL_IF_MACRO(filename == NULL, ERR_INVALID_ARGUMENT, NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	684
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	685 ext = strrchr(filename, '.');
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	686 rw = SDL_RWFromFile(filename, "rb");
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	687 BAIL_IF_MACRO(rw == NULL, SDL_GetError(), NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	688
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	689 if (ext != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	690 ext++;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	691
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	692 return(Sound_NewSample(rw, ext, desired, bufferSize));
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	693 } /* Sound_NewSampleFromFile */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	694
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	695
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	696 void Sound_FreeSample(Sound_Sample *sample)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	697 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	698 Sound_SampleInternal *internal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	699
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	700 if (!initialized)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	701 {
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	702 __Sound_SetError(ERR_NOT_INITIALIZED);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	703 return;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	704 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	705
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	706 if (sample == NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	707 {
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	708 __Sound_SetError(ERR_INVALID_ARGUMENT);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	709 return;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	710 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	711
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	712 internal = (Sound_SampleInternal *) sample->opaque;
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_LockMutex(samplelist_mutex);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	715
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	716 /* update the sample_list... */
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	717 if (internal->prev != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	718 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	719 Sound_SampleInternal *prevInternal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	720 prevInternal = (Sound_SampleInternal *) internal->prev->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	721 prevInternal->next = internal->next;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	722 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	723 else
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	724 {
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	725 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	726 sample_list = internal->next;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	727 } /* else */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	728
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	729 if (internal->next != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	730 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	731 Sound_SampleInternal *nextInternal;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	732 nextInternal = (Sound_SampleInternal *) internal->next->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	733 nextInternal->prev = internal->prev;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	734 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	735
237 ceadd952319a Increased ModPlug decoder's priority to be above MikMod. Fixed some coding Ryan C. Gordon <icculus@icculus.org> parents: 226 diff changeset	736 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	737
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	738 /* 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	739 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	740
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	741 if (internal->rw != NULL) /* this condition is a "just in case" thing. */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	742 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	743
82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	744 if ((internal->buffer != NULL) && (internal->buffer != sample->buffer))
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	745 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	746
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	747 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	748
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	749 if (sample->buffer != NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	750 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	751
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	752 free(sample);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	753 } /* Sound_FreeSample */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	754
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 int Sound_SetBufferSize(Sound_Sample *sample, Uint32 newSize)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	757 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	758 void *newBuf = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	759 Sound_SampleInternal *internal = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	760
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	761 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	762 BAIL_IF_MACRO(sample == NULL, ERR_INVALID_ARGUMENT, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	763 internal = ((Sound_SampleInternal *) sample->opaque);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	764 newBuf = realloc(sample->buffer, newSize * internal->sdlcvt.len_mult);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	765 BAIL_IF_MACRO(newBuf == NULL, ERR_OUT_OF_MEMORY, 0);
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 internal->sdlcvt.buf = internal->buffer = sample->buffer = newBuf;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	768 sample->buffer_size = newSize;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	769 internal->buffer_size = newSize / internal->sdlcvt.len_mult;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	770 internal->sdlcvt.len = internal->buffer_size;
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 return(1);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	773 } /* Sound_SetBufferSize */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	774
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	775
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	776 Uint32 Sound_Decode(Sound_Sample *sample)
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 Sound_SampleInternal *internal = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	779 Uint32 retval = 0;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	780
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	781 /* a boatload of sanity checks... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	782 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	783 BAIL_IF_MACRO(sample == NULL, ERR_INVALID_ARGUMENT, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	784 BAIL_IF_MACRO(sample->flags & SOUND_SAMPLEFLAG_ERROR, ERR_PREV_ERROR, 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	785 BAIL_IF_MACRO(sample->flags & SOUND_SAMPLEFLAG_EOF, ERR_PREV_EOF, 0);
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 internal = (Sound_SampleInternal *) sample->opaque;
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 assert(sample->buffer != NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	790 assert(sample->buffer_size > 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	791 assert(internal->buffer != NULL);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	792 assert(internal->buffer_size > 0);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	793
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	794 /* reset EAGAIN. Decoder can flip it back on if it needs to. */
311 d62c05322a3e Logic fixes from Torbj�rn. Ryan C. Gordon <icculus@icculus.org> parents: 306 diff changeset	795 sample->flags &= ~SOUND_SAMPLEFLAG_EAGAIN;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	796 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	797
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	798 if (retval > 0 && internal->sdlcvt.needed)
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	799 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	800 internal->sdlcvt.len = retval;
143 3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	801 Sound_ConvertAudio(&internal->sdlcvt);
3e60862fbd76 Start of audio converter work. Ryan C. Gordon <icculus@icculus.org> parents: 118 diff changeset	802 retval = internal->sdlcvt.len_cvt;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	803 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	804
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	805 return(retval);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	806 } /* Sound_Decode */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	807
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	808
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	809 Uint32 Sound_DecodeAll(Sound_Sample *sample)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	810 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	811 Sound_SampleInternal *internal = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	812 void *buf = NULL;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	813 Uint32 newBufSize = 0;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	814
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	815 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	816 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	817 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	818
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	819 internal = (Sound_SampleInternal *) sample->opaque;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	820
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	821 while ( ((sample->flags & SOUND_SAMPLEFLAG_EOF) == 0) &&
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	822 ((sample->flags & SOUND_SAMPLEFLAG_ERROR) == 0) )
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	823 {
172 705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	824 Uint32 br = Sound_Decode(sample);
705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	825 void *ptr = realloc(buf, newBufSize + br);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	826 if (ptr == NULL)
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	827 {
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	828 sample->flags \|= SOUND_SAMPLEFLAG_ERROR;
387 fb519e6028e3 Changed all the Sound_SetError() calls to __Sound_SetError (or BAIL_MACRO) Ryan C. Gordon <icculus@icculus.org>* parents: 382 diff changeset	829 __Sound_SetError(ERR_OUT_OF_MEMORY);
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	830 } /* if */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	831 else
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	832 {
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	833 buf = ptr;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	834 memcpy( ((char *) buf) + newBufSize, sample->buffer, br );
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	835 newBufSize += br;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	836 } /* else */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	837 } /* while */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	838
172 705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	839 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	840 return(sample->buffer_size);
705dcbf94639 Sound_DecodeAll() is now more robust. Ryan C. Gordon <icculus@icculus.org> parents: 167 diff changeset	841
167 82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	842 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	843 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	844
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	845 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	846
82acaa7107c2 Fixed Sound_DecodeAll(), and made Sound_FreeSample() a little more robust. Ryan C. Gordon <icculus@icculus.org> parents: 165 diff changeset	847 internal->sdlcvt.buf = internal->buffer = sample->buffer = buf;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	848 sample->buffer_size = newBufSize;
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	849 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	850 internal->sdlcvt.len = internal->buffer_size;
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	851
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	852 return(newBufSize);
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	853 } /* Sound_DecodeAll */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	854
223 249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	855
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	856 int Sound_Rewind(Sound_Sample *sample)
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	857 {
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	858 Sound_SampleInternal *internal;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	859 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	860
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	861 internal = (Sound_SampleInternal *) sample->opaque;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	862 if (!internal->funcs->rewind(sample))
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	863 {
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	864 sample->flags \|= SOUND_SAMPLEFLAG_ERROR;
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	865 return(0);
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	866 } /* if */
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	867
311 d62c05322a3e Logic fixes from Torbj�rn. Ryan C. Gordon <icculus@icculus.org> parents: 306 diff changeset	868 sample->flags &= ~SOUND_SAMPLEFLAG_EAGAIN;
d62c05322a3e Logic fixes from Torbj�rn. Ryan C. Gordon <icculus@icculus.org> parents: 306 diff changeset	869 sample->flags &= ~SOUND_SAMPLEFLAG_ERROR;
d62c05322a3e Logic fixes from Torbj�rn. Ryan C. Gordon <icculus@icculus.org> parents: 306 diff changeset	870 sample->flags &= ~SOUND_SAMPLEFLAG_EOF;
306 c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	871
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	872 return(1);
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	873 } /* Sound_Rewind */
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	874
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	875
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	876 int Sound_Seek(Sound_Sample *sample, Uint32 ms)
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	877 {
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	878 Sound_SampleInternal *internal;
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	879
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	880 BAIL_IF_MACRO(!initialized, ERR_NOT_INITIALIZED, 0);
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	881 if (!(sample->flags & SOUND_SAMPLEFLAG_CANSEEK))
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	882 BAIL_MACRO(ERR_CANNOT_SEEK, 0);
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	883
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	884 internal = (Sound_SampleInternal *) sample->opaque;
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	885 BAIL_IF_MACRO(!internal->funcs->seek(sample, ms), NULL, 0);
c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	886
311 d62c05322a3e Logic fixes from Torbj�rn. Ryan C. Gordon <icculus@icculus.org> parents: 306 diff changeset	887 sample->flags &= ~SOUND_SAMPLEFLAG_EAGAIN;
d62c05322a3e Logic fixes from Torbj�rn. Ryan C. Gordon <icculus@icculus.org> parents: 306 diff changeset	888 sample->flags &= ~SOUND_SAMPLEFLAG_ERROR;
d62c05322a3e Logic fixes from Torbj�rn. Ryan C. Gordon <icculus@icculus.org> parents: 306 diff changeset	889 sample->flags &= ~SOUND_SAMPLEFLAG_EOF;
306 c97be6e1bd27 Added framework for Sound_Seek() support. Ryan C. Gordon <icculus@icculus.org> parents: 262 diff changeset	890
223 249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	891 return(1);
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	892 } /* Sound_Rewind */
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	893
249186e31431 Sound_Rewind() support code. Ryan C. Gordon <icculus@icculus.org> parents: 219 diff changeset	894
4 341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	895 /* end of SDL_sound.c ... */
341cea3e13c6 Initial add. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	896

Mercurial > SDL_sound_CoreAudio

annotate SDL_sound.c @ 443:30f96c853462