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