Mercurial > sdl-ios-xcode
annotate src/audio/SDL_audio.c @ 1176:dd2a8deeb26d
Date: Mon, 17 Oct 2005 20:09:03 -0400
From: Mark Schreiber <mark7@alumni.cmu.edu>
To: ryan@clutteredmind.org
Subject: [PATCH]SDL mprotect() crash fix
(I'm going to throw this patch your way at the suggestion of #SDL --
for some reason, I had some difficulty sending it to the main list
last time, and I go bonkers subscribing to send each email or
patch...)
Currently, when I run SDL applications as non-root using
SDL_VIDEODRIVER=dga, the fbdev fallback mprotect()s read/write the
proper size of mmapped /dev/fb0 (7.5MB), but on framebuffer release
mprotect()s read-only the range by the entire size of my video memory
(128MB), which causes a segfault:
#0 0x002a9a27 in ?? () from /lib/libc.so.6
#1 0x04a63eb6 in SDL_XDGAUnmapFramebuffer (screen=3D0) at XF86DGA2.c:978
#2 0x04a63efc in SDL_XDGACloseFramebuffer (dpy=3D0x9d3f008, screen=3D0)
at XF86DGA2.c:268
#3 0x04a68b57 in DGA_Available () at SDL_dgavideo.c:98
#4 0x04a53677 in SDL_VideoInit (driver_name=3D0xbfb0bfc7 "dga", flags=3D0)
at SDL_video.c:180
#5 0x04a2613f in SDL_InitSubSystem (flags=3D32) at SDL.c:74
#6 0x04a2617c in SDL_Init (flags=3D32) at SDL.c:166
#7 0x08049722 in main (argc=3D1, argv=3D0x0) at testwin.c:32
This is SDL 1.2.8 on Fedora Core 4, radeon driver for a Radeon 9250,
xorg-x11-6.8.2-37.
I've attached a one-line patch against SDL CVS that updates the size
of the framebuffer at framebuffer map time so that the mprotect() on
unmap will be the same size. I'm not sure if this is the best
approach (i.e. one might want to retain the original value), but it
does make my SDL applications work without segfaulting.
-- Best of luck, Mark Schreiber
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sat, 19 Nov 2005 18:57:00 +0000 |
| parents | d74fbf56f2f6 |
| children | 173c063d4f55 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
663
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 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 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
148
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 /* Allow access to a raw mixing buffer */ | |
| 29 #include <stdlib.h> | |
| 30 #include <stdio.h> | |
| 31 #include <string.h> | |
| 32 | |
| 33 #include "SDL.h" | |
| 34 #include "SDL_audio.h" | |
| 35 #include "SDL_timer.h" | |
| 36 #include "SDL_error.h" | |
| 37 #include "SDL_audio_c.h" | |
| 38 #include "SDL_audiomem.h" | |
| 39 #include "SDL_sysaudio.h" | |
| 40 | |
| 41 /* Available audio drivers */ | |
| 42 static AudioBootStrap *bootstrap[] = { | |
|
121
43febd46d49d
Name changed from OBSD to OPENBSD_AUDIO
Sam Lantinga <slouken@libsdl.org>
parents:
94
diff
changeset
|
43 #ifdef OPENBSD_AUDIO_SUPPORT |
|
43febd46d49d
Name changed from OBSD to OPENBSD_AUDIO
Sam Lantinga <slouken@libsdl.org>
parents:
94
diff
changeset
|
44 &OPENBSD_AUDIO_bootstrap, |
|
94
ae6e6b73333f
Cleaned up the OpenBSD port, thanks to Peter Valchev
Sam Lantinga <slouken@lokigames.com>
parents:
68
diff
changeset
|
45 #endif |
| 0 | 46 #ifdef OSS_SUPPORT |
| 47 &DSP_bootstrap, | |
| 48 &DMA_bootstrap, | |
| 49 #endif | |
| 50 #ifdef ALSA_SUPPORT | |
| 51 &ALSA_bootstrap, | |
| 52 #endif | |
|
663
8bedd6d61642
Date: Sat, 2 Aug 2003 16:22:51 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
654
diff
changeset
|
53 #ifdef QNXNTOAUDIO_SUPPORT |
|
8bedd6d61642
Date: Sat, 2 Aug 2003 16:22:51 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
654
diff
changeset
|
54 &QNXNTOAUDIO_bootstrap, |
|
8bedd6d61642
Date: Sat, 2 Aug 2003 16:22:51 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
654
diff
changeset
|
55 #endif |
|
148
8758b8d42cd9
Audio subsystem no longer assumes sun audio API on UNIX systems
Sam Lantinga <slouken@libsdl.org>
parents:
121
diff
changeset
|
56 #ifdef SUNAUDIO_SUPPORT |
|
8758b8d42cd9
Audio subsystem no longer assumes sun audio API on UNIX systems
Sam Lantinga <slouken@libsdl.org>
parents:
121
diff
changeset
|
57 &SUNAUDIO_bootstrap, |
|
8758b8d42cd9
Audio subsystem no longer assumes sun audio API on UNIX systems
Sam Lantinga <slouken@libsdl.org>
parents:
121
diff
changeset
|
58 #endif |
|
8758b8d42cd9
Audio subsystem no longer assumes sun audio API on UNIX systems
Sam Lantinga <slouken@libsdl.org>
parents:
121
diff
changeset
|
59 #ifdef DMEDIA_SUPPORT |
|
8758b8d42cd9
Audio subsystem no longer assumes sun audio API on UNIX systems
Sam Lantinga <slouken@libsdl.org>
parents:
121
diff
changeset
|
60 &DMEDIA_bootstrap, |
|
35
d3bc792e136d
Added detection of Open Sound System on Solaris x86
Sam Lantinga <slouken@lokigames.com>
parents:
21
diff
changeset
|
61 #endif |
| 0 | 62 #ifdef ARTSC_SUPPORT |
| 63 &ARTSC_bootstrap, | |
| 64 #endif | |
| 65 #ifdef ESD_SUPPORT | |
| 66 &ESD_bootstrap, | |
| 67 #endif | |
| 68 #ifdef NAS_SUPPORT | |
| 69 &NAS_bootstrap, | |
| 70 #endif | |
| 71 #ifdef ENABLE_DIRECTX | |
| 72 &DSOUND_bootstrap, | |
| 73 #endif | |
| 74 #ifdef ENABLE_WINDIB | |
| 75 &WAVEOUT_bootstrap, | |
| 76 #endif | |
| 77 #ifdef __BEOS__ | |
| 78 &BAUDIO_bootstrap, | |
| 79 #endif | |
|
936
84f930aebaeb
CoreAudio driver works on Mac OSX 10.1
Sam Lantinga <slouken@libsdl.org>
parents:
935
diff
changeset
|
80 #ifdef MACOSX |
|
935
f8d5ddc7aef1
Audio improvements from Max Horn, including a new CoreAudio driver for MacOSX
Sam Lantinga <slouken@libsdl.org>
parents:
808
diff
changeset
|
81 &COREAUDIO_bootstrap, |
|
f8d5ddc7aef1
Audio improvements from Max Horn, including a new CoreAudio driver for MacOSX
Sam Lantinga <slouken@libsdl.org>
parents:
808
diff
changeset
|
82 #endif |
| 0 | 83 #if defined(macintosh) || TARGET_API_MAC_CARBON |
| 84 &SNDMGR_bootstrap, | |
| 85 #endif | |
| 86 #ifdef _AIX | |
| 87 &Paud_bootstrap, | |
| 88 #endif | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
89 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
90 &AHI_bootstrap, |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
91 #endif |
|
654
e92bcf2573cb
Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)
Sam Lantinga <slouken@libsdl.org>
parents:
644
diff
changeset
|
92 #ifdef MMEAUDIO_SUPPORT |
|
e92bcf2573cb
Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)
Sam Lantinga <slouken@libsdl.org>
parents:
644
diff
changeset
|
93 &MMEAUDIO_bootstrap, |
|
e92bcf2573cb
Added audio and CD-ROM support for OSF/Tru64 (thanks Hayashi!)
Sam Lantinga <slouken@libsdl.org>
parents:
644
diff
changeset
|
94 #endif |
|
398
d219b0e02f5f
Added Atari audio support (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
322
diff
changeset
|
95 #ifdef MINTAUDIO_SUPPORT |
|
644
594422ab8f9f
Atari MiNT: added more audio drivers
Patrice Mandin <patmandin@gmail.com>
parents:
630
diff
changeset
|
96 &MINTAUDIO_GSXB_bootstrap, |
|
594422ab8f9f
Atari MiNT: added more audio drivers
Patrice Mandin <patmandin@gmail.com>
parents:
630
diff
changeset
|
97 &MINTAUDIO_MCSN_bootstrap, |
|
594422ab8f9f
Atari MiNT: added more audio drivers
Patrice Mandin <patmandin@gmail.com>
parents:
630
diff
changeset
|
98 &MINTAUDIO_STFA_bootstrap, |
|
594422ab8f9f
Atari MiNT: added more audio drivers
Patrice Mandin <patmandin@gmail.com>
parents:
630
diff
changeset
|
99 &MINTAUDIO_XBIOS_bootstrap, |
|
594422ab8f9f
Atari MiNT: added more audio drivers
Patrice Mandin <patmandin@gmail.com>
parents:
630
diff
changeset
|
100 &MINTAUDIO_DMA8_bootstrap, |
|
398
d219b0e02f5f
Added Atari audio support (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
322
diff
changeset
|
101 #endif |
|
68
ac6645260d31
Added an audio driver that writes to disk (thanks Ryan!)
Sam Lantinga <slouken@lokigames.com>
parents:
38
diff
changeset
|
102 #ifdef DISKAUD_SUPPORT |
|
ac6645260d31
Added an audio driver that writes to disk (thanks Ryan!)
Sam Lantinga <slouken@lokigames.com>
parents:
38
diff
changeset
|
103 &DISKAUD_bootstrap, |
|
ac6645260d31
Added an audio driver that writes to disk (thanks Ryan!)
Sam Lantinga <slouken@lokigames.com>
parents:
38
diff
changeset
|
104 #endif |
|
509
dad72daf44b3
Added initial support for Dreamcast (thanks HERO!)
Sam Lantinga <slouken@libsdl.org>
parents:
398
diff
changeset
|
105 #ifdef ENABLE_DC |
|
dad72daf44b3
Added initial support for Dreamcast (thanks HERO!)
Sam Lantinga <slouken@libsdl.org>
parents:
398
diff
changeset
|
106 &DCAUD_bootstrap, |
|
dad72daf44b3
Added initial support for Dreamcast (thanks HERO!)
Sam Lantinga <slouken@libsdl.org>
parents:
398
diff
changeset
|
107 #endif |
|
630
550bccdf04bd
Added initial support for RISC OS (thanks Peter Naulls!)
Sam Lantinga <slouken@libsdl.org>
parents:
509
diff
changeset
|
108 #ifdef DRENDERER_SUPPORT |
|
550bccdf04bd
Added initial support for RISC OS (thanks Peter Naulls!)
Sam Lantinga <slouken@libsdl.org>
parents:
509
diff
changeset
|
109 &DRENDERER_bootstrap, |
|
550bccdf04bd
Added initial support for RISC OS (thanks Peter Naulls!)
Sam Lantinga <slouken@libsdl.org>
parents:
509
diff
changeset
|
110 #endif |
| 0 | 111 NULL |
| 112 }; | |
| 113 SDL_AudioDevice *current_audio = NULL; | |
| 114 | |
| 115 /* Various local functions */ | |
| 116 int SDL_AudioInit(const char *driver_name); | |
| 117 void SDL_AudioQuit(void); | |
| 118 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
119 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
120 static int audio_configured = 0; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
121 #endif |
| 0 | 122 |
| 123 /* The general mixing thread function */ | |
| 124 int SDL_RunAudio(void *audiop) | |
| 125 { | |
| 126 SDL_AudioDevice *audio = (SDL_AudioDevice *)audiop; | |
| 127 Uint8 *stream; | |
| 128 int stream_len; | |
| 129 void *udata; | |
| 130 void (*fill)(void *userdata,Uint8 *stream, int len); | |
| 131 int silence; | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
132 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
133 int started = 0; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
134 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
135 /* AmigaOS NEEDS that the audio driver is opened in the thread that uses it! */ |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
136 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
137 D(bug("Task audio started audio struct:<%lx>...\n",audiop)); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
138 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
139 D(bug("Before Openaudio...")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
140 if(audio->OpenAudio(audio, &audio->spec)==-1) |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
141 { |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
142 D(bug("Open audio failed...\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
143 return(-1); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
144 } |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
145 D(bug("OpenAudio...OK\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
146 #endif |
| 0 | 147 |
| 148 /* Perform any thread setup */ | |
| 149 if ( audio->ThreadInit ) { | |
| 150 audio->ThreadInit(audio); | |
| 151 } | |
| 152 audio->threadid = SDL_ThreadID(); | |
| 153 | |
| 154 /* Set up the mixing function */ | |
| 155 fill = audio->spec.callback; | |
| 156 udata = audio->spec.userdata; | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
157 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
158 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
159 audio_configured = 1; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
160 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
161 D(bug("Audio configured... Checking for conversion\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
162 SDL_mutexP(audio->mixer_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
163 D(bug("Semaphore obtained...\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
164 #endif |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
165 |
| 0 | 166 if ( audio->convert.needed ) { |
| 167 if ( audio->convert.src_format == AUDIO_U8 ) { | |
| 168 silence = 0x80; | |
| 169 } else { | |
| 170 silence = 0; | |
| 171 } | |
| 172 stream_len = audio->convert.len; | |
| 173 } else { | |
| 174 silence = audio->spec.silence; | |
| 175 stream_len = audio->spec.size; | |
| 176 } | |
| 177 stream = audio->fake_stream; | |
| 178 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
179 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
180 SDL_mutexV(audio->mixer_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
181 D(bug("Entering audio loop...\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
182 #endif |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
183 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
184 |
| 0 | 185 /* Loop, filling the audio buffers */ |
| 186 while ( audio->enabled ) { | |
| 187 | |
| 188 /* Wait for new current buffer to finish playing */ | |
| 189 if ( stream == audio->fake_stream ) { | |
| 190 SDL_Delay((audio->spec.samples*1000)/audio->spec.freq); | |
| 191 } else { | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
192 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
193 if ( started > 1 ) |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
194 #endif |
| 0 | 195 audio->WaitAudio(audio); |
| 196 } | |
| 197 | |
| 198 /* Fill the current buffer with sound */ | |
| 199 if ( audio->convert.needed ) { | |
| 200 if ( audio->convert.buf ) { | |
| 201 stream = audio->convert.buf; | |
| 202 } else { | |
| 203 continue; | |
| 204 } | |
| 205 } else { | |
| 206 stream = audio->GetAudioBuf(audio); | |
| 207 if ( stream == NULL ) { | |
| 208 stream = audio->fake_stream; | |
| 209 } | |
| 210 } | |
| 211 memset(stream, silence, stream_len); | |
| 212 | |
| 213 if ( ! audio->paused ) { | |
| 214 SDL_mutexP(audio->mixer_lock); | |
| 215 (*fill)(udata, stream, stream_len); | |
| 216 SDL_mutexV(audio->mixer_lock); | |
| 217 } | |
| 218 | |
| 219 /* Convert the audio if necessary */ | |
| 220 if ( audio->convert.needed ) { | |
| 221 SDL_ConvertAudio(&audio->convert); | |
| 222 stream = audio->GetAudioBuf(audio); | |
| 223 if ( stream == NULL ) { | |
| 224 stream = audio->fake_stream; | |
| 225 } | |
| 226 memcpy(stream, audio->convert.buf, | |
| 227 audio->convert.len_cvt); | |
| 228 } | |
| 229 | |
| 230 /* Ready current buffer for play and change current buffer */ | |
| 231 if ( stream != audio->fake_stream ) { | |
| 232 audio->PlayAudio(audio); | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
233 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
234 /* AmigaOS don't have to wait the first time audio is played! */ |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
235 started++; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
236 #endif |
| 0 | 237 } |
| 238 } | |
| 239 /* Wait for the audio to drain.. */ | |
| 240 if ( audio->WaitDone ) { | |
| 241 audio->WaitDone(audio); | |
| 242 } | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
243 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
244 #ifdef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
245 D(bug("WaitAudio...Done\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
246 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
247 audio->CloseAudio(audio); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
248 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
249 D(bug("CloseAudio..Done, subtask exiting...\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
250 audio_configured = 0; |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
251 #endif |
| 0 | 252 return(0); |
| 253 } | |
| 254 | |
|
322
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
255 static void SDL_LockAudio_Default(SDL_AudioDevice *audio) |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
256 { |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
257 if ( audio->thread && (SDL_ThreadID() == audio->threadid) ) { |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
258 return; |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
259 } |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
260 SDL_mutexP(audio->mixer_lock); |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
261 } |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
262 |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
263 static void SDL_UnlockAudio_Default(SDL_AudioDevice *audio) |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
264 { |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
265 if ( audio->thread && (SDL_ThreadID() == audio->threadid) ) { |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
266 return; |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
267 } |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
268 SDL_mutexV(audio->mixer_lock); |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
269 } |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
270 |
| 0 | 271 int SDL_AudioInit(const char *driver_name) |
| 272 { | |
| 273 SDL_AudioDevice *audio; | |
| 274 int i = 0, idx; | |
| 275 | |
| 276 /* Check to make sure we don't overwrite 'current_audio' */ | |
| 277 if ( current_audio != NULL ) { | |
| 278 SDL_AudioQuit(); | |
| 279 } | |
| 280 | |
| 281 /* Select the proper audio driver */ | |
| 282 audio = NULL; | |
| 283 idx = 0; | |
| 284 #ifdef unix | |
| 285 if ( (driver_name == NULL) && (getenv("ESPEAKER") != NULL) ) { | |
| 286 /* Ahem, we know that if ESPEAKER is set, user probably wants | |
| 287 to use ESD, but don't start it if it's not already running. | |
| 288 This probably isn't the place to do this, but... Shh! :) | |
| 289 */ | |
| 290 for ( i=0; bootstrap[i]; ++i ) { | |
| 291 if ( strcmp(bootstrap[i]->name, "esd") == 0 ) { | |
| 292 const char *esd_no_spawn; | |
| 293 | |
| 294 /* Don't start ESD if it's not running */ | |
| 295 esd_no_spawn = getenv("ESD_NO_SPAWN"); | |
| 296 if ( esd_no_spawn == NULL ) { | |
| 297 putenv("ESD_NO_SPAWN=1"); | |
| 298 } | |
| 299 if ( bootstrap[i]->available() ) { | |
| 300 audio = bootstrap[i]->create(0); | |
| 301 break; | |
| 302 } | |
| 303 #ifdef linux /* No unsetenv() on most platforms */ | |
| 304 if ( esd_no_spawn == NULL ) { | |
| 305 unsetenv("ESD_NO_SPAWN"); | |
| 306 } | |
| 307 #endif | |
| 308 } | |
| 309 } | |
| 310 } | |
| 311 #endif /* unix */ | |
| 312 if ( audio == NULL ) { | |
| 313 if ( driver_name != NULL ) { | |
| 314 #if 0 /* This will be replaced with a better driver selection API */ | |
| 315 if ( strrchr(driver_name, ':') != NULL ) { | |
| 316 idx = atoi(strrchr(driver_name, ':')+1); | |
| 317 } | |
| 318 #endif | |
| 319 for ( i=0; bootstrap[i]; ++i ) { | |
| 320 if (strncmp(bootstrap[i]->name, driver_name, | |
| 321 strlen(bootstrap[i]->name)) == 0) { | |
| 322 if ( bootstrap[i]->available() ) { | |
| 323 audio=bootstrap[i]->create(idx); | |
| 324 break; | |
| 325 } | |
| 326 } | |
| 327 } | |
| 328 } else { | |
| 329 for ( i=0; bootstrap[i]; ++i ) { | |
| 330 if ( bootstrap[i]->available() ) { | |
| 331 audio = bootstrap[i]->create(idx); | |
| 332 if ( audio != NULL ) { | |
| 333 break; | |
| 334 } | |
| 335 } | |
| 336 } | |
| 337 } | |
| 338 if ( audio == NULL ) { | |
| 339 SDL_SetError("No available audio device"); | |
| 340 #if 0 /* Don't fail SDL_Init() if audio isn't available. | |
| 341 SDL_OpenAudio() will handle it at that point. *sigh* | |
| 342 */ | |
| 343 return(-1); | |
| 344 #endif | |
| 345 } | |
| 346 } | |
| 347 current_audio = audio; | |
| 348 if ( current_audio ) { | |
| 349 current_audio->name = bootstrap[i]->name; | |
|
322
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
350 if ( !current_audio->LockAudio && !current_audio->UnlockAudio ) { |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
351 current_audio->LockAudio = SDL_LockAudio_Default; |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
352 current_audio->UnlockAudio = SDL_UnlockAudio_Default; |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
353 } |
| 0 | 354 } |
| 355 return(0); | |
| 356 } | |
| 357 | |
| 358 char *SDL_AudioDriverName(char *namebuf, int maxlen) | |
| 359 { | |
| 360 if ( current_audio != NULL ) { | |
| 361 strncpy(namebuf, current_audio->name, maxlen-1); | |
| 362 namebuf[maxlen-1] = '\0'; | |
| 363 return(namebuf); | |
| 364 } | |
| 365 return(NULL); | |
| 366 } | |
| 367 | |
| 368 int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained) | |
| 369 { | |
| 370 SDL_AudioDevice *audio; | |
| 371 | |
| 372 /* Start up the audio driver, if necessary */ | |
| 373 if ( ! current_audio ) { | |
| 374 if ( (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) || | |
| 375 (current_audio == NULL) ) { | |
| 376 return(-1); | |
| 377 } | |
| 378 } | |
| 379 audio = current_audio; | |
| 380 | |
|
262
ba5363e21df8
Don't allow multiple audio opens to succeed (until SDL 1.3)
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
381 if (audio->opened) { |
|
ba5363e21df8
Don't allow multiple audio opens to succeed (until SDL 1.3)
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
382 SDL_SetError("Audio device is already opened"); |
|
ba5363e21df8
Don't allow multiple audio opens to succeed (until SDL 1.3)
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
383 return(-1); |
|
ba5363e21df8
Don't allow multiple audio opens to succeed (until SDL 1.3)
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
384 } |
|
ba5363e21df8
Don't allow multiple audio opens to succeed (until SDL 1.3)
Sam Lantinga <slouken@libsdl.org>
parents:
252
diff
changeset
|
385 |
| 0 | 386 /* Verify some parameters */ |
| 387 if ( desired->callback == NULL ) { | |
| 388 SDL_SetError("SDL_OpenAudio() passed a NULL callback"); | |
| 389 return(-1); | |
| 390 } | |
| 391 switch ( desired->channels ) { | |
| 392 case 1: /* Mono */ | |
| 393 case 2: /* Stereo */ | |
|
942
41a59de7f2ed
Here are patches for SDL12 and SDL_mixer for 4 or 6 channel
Sam Lantinga <slouken@libsdl.org>
parents:
936
diff
changeset
|
394 case 4: /* surround */ |
|
41a59de7f2ed
Here are patches for SDL12 and SDL_mixer for 4 or 6 channel
Sam Lantinga <slouken@libsdl.org>
parents:
936
diff
changeset
|
395 case 6: /* surround with center and lfe */ |
| 0 | 396 break; |
| 397 default: | |
| 398 SDL_SetError("1 (mono) and 2 (stereo) channels supported"); | |
| 399 return(-1); | |
| 400 } | |
| 401 | |
|
955
d74fbf56f2f6
Date: Fri, 25 Jun 2004 13:29:15 +0100
Sam Lantinga <slouken@libsdl.org>
parents:
942
diff
changeset
|
402 #if defined(macintosh) || (defined(__riscos__) && !defined(DISABLE_THREADS)) |
| 0 | 403 /* FIXME: Need to implement PPC interrupt asm for SDL_LockAudio() */ |
| 404 #else | |
|
398
d219b0e02f5f
Added Atari audio support (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
322
diff
changeset
|
405 #if defined(__MINT__) && !defined(ENABLE_THREADS) |
|
d219b0e02f5f
Added Atari audio support (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
322
diff
changeset
|
406 /* Uses interrupt driven audio, without thread */ |
|
d219b0e02f5f
Added Atari audio support (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
322
diff
changeset
|
407 #else |
| 0 | 408 /* Create a semaphore for locking the sound buffers */ |
| 409 audio->mixer_lock = SDL_CreateMutex(); | |
| 410 if ( audio->mixer_lock == NULL ) { | |
| 411 SDL_SetError("Couldn't create mixer lock"); | |
| 412 SDL_CloseAudio(); | |
| 413 return(-1); | |
| 414 } | |
|
398
d219b0e02f5f
Added Atari audio support (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
322
diff
changeset
|
415 #endif /* __MINT__ */ |
|
d219b0e02f5f
Added Atari audio support (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents:
322
diff
changeset
|
416 #endif /* macintosh */ |
| 0 | 417 |
| 418 /* Calculate the silence and size of the audio specification */ | |
| 419 SDL_CalculateAudioSpec(desired); | |
| 420 | |
| 421 /* Open the audio subsystem */ | |
| 422 memcpy(&audio->spec, desired, sizeof(audio->spec)); | |
| 423 audio->convert.needed = 0; | |
| 424 audio->enabled = 1; | |
| 425 audio->paused = 1; | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
426 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
427 #ifndef ENABLE_AHI |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
428 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
429 /* AmigaOS opens audio inside the main loop */ |
| 0 | 430 audio->opened = audio->OpenAudio(audio, &audio->spec)+1; |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
431 |
| 0 | 432 if ( ! audio->opened ) { |
| 433 SDL_CloseAudio(); | |
| 434 return(-1); | |
| 435 } | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
436 #else |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
437 D(bug("Locking semaphore...")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
438 SDL_mutexP(audio->mixer_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
439 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
440 audio->thread = SDL_CreateThread(SDL_RunAudio, audio); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
441 D(bug("Created thread...\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
442 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
443 if ( audio->thread == NULL ) { |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
444 SDL_mutexV(audio->mixer_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
445 SDL_CloseAudio(); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
446 SDL_SetError("Couldn't create audio thread"); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
447 return(-1); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
448 } |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
449 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
450 while(!audio_configured) |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
451 SDL_Delay(100); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
452 #endif |
| 0 | 453 |
| 454 /* If the audio driver changes the buffer size, accept it */ | |
| 455 if ( audio->spec.samples != desired->samples ) { | |
| 456 desired->samples = audio->spec.samples; | |
| 457 SDL_CalculateAudioSpec(desired); | |
| 458 } | |
| 459 | |
| 460 /* Allocate a fake audio memory buffer */ | |
| 461 audio->fake_stream = SDL_AllocAudioMem(audio->spec.size); | |
| 462 if ( audio->fake_stream == NULL ) { | |
| 463 SDL_CloseAudio(); | |
| 464 SDL_OutOfMemory(); | |
| 465 return(-1); | |
| 466 } | |
| 467 | |
| 468 /* See if we need to do any conversion */ | |
|
808
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
469 if ( obtained != NULL ) { |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
470 memcpy(obtained, &audio->spec, sizeof(audio->spec)); |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
471 } else if ( desired->freq != audio->spec.freq || |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
472 desired->format != audio->spec.format || |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
473 desired->channels != audio->spec.channels ) { |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
474 /* Build an audio conversion block */ |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
475 if ( SDL_BuildAudioCVT(&audio->convert, |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
476 desired->format, desired->channels, |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
477 desired->freq, |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
478 audio->spec.format, audio->spec.channels, |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
479 audio->spec.freq) < 0 ) { |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
480 SDL_CloseAudio(); |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
481 return(-1); |
| 0 | 482 } |
|
808
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
483 if ( audio->convert.needed ) { |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
484 audio->convert.len = desired->size; |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
485 audio->convert.buf =(Uint8 *)SDL_AllocAudioMem( |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
486 audio->convert.len*audio->convert.len_mult); |
|
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
487 if ( audio->convert.buf == NULL ) { |
| 0 | 488 SDL_CloseAudio(); |
|
808
0defd90ef27c
Simplify code and clean up Valgrind warning
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
489 SDL_OutOfMemory(); |
| 0 | 490 return(-1); |
| 491 } | |
| 492 } | |
| 493 } | |
| 494 | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
495 #ifndef ENABLE_AHI |
| 0 | 496 /* Start the audio thread if necessary */ |
| 497 switch (audio->opened) { | |
| 498 case 1: | |
| 499 /* Start the audio thread */ | |
| 500 audio->thread = SDL_CreateThread(SDL_RunAudio, audio); | |
| 501 if ( audio->thread == NULL ) { | |
| 502 SDL_CloseAudio(); | |
| 503 SDL_SetError("Couldn't create audio thread"); | |
| 504 return(-1); | |
| 505 } | |
| 506 break; | |
| 507 | |
| 508 default: | |
| 509 /* The audio is now playing */ | |
| 510 break; | |
| 511 } | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
512 #else |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
513 SDL_mutexV(audio->mixer_lock); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
514 D(bug("SDL_OpenAudio USCITA...\n")); |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
515 |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
516 #endif |
|
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
517 |
| 0 | 518 return(0); |
| 519 } | |
| 520 | |
| 521 SDL_audiostatus SDL_GetAudioStatus(void) | |
| 522 { | |
| 523 SDL_AudioDevice *audio = current_audio; | |
| 524 SDL_audiostatus status; | |
| 525 | |
| 526 status = SDL_AUDIO_STOPPED; | |
| 527 if ( audio && audio->enabled ) { | |
| 528 if ( audio->paused ) { | |
| 529 status = SDL_AUDIO_PAUSED; | |
| 530 } else { | |
| 531 status = SDL_AUDIO_PLAYING; | |
| 532 } | |
| 533 } | |
| 534 return(status); | |
| 535 } | |
| 536 | |
| 537 void SDL_PauseAudio (int pause_on) | |
| 538 { | |
| 539 SDL_AudioDevice *audio = current_audio; | |
| 540 | |
| 541 if ( audio ) { | |
| 542 audio->paused = pause_on; | |
| 543 } | |
| 544 } | |
| 545 | |
| 546 void SDL_LockAudio (void) | |
| 547 { | |
| 548 SDL_AudioDevice *audio = current_audio; | |
| 549 | |
| 550 /* Obtain a lock on the mixing buffers */ | |
|
322
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
551 if ( audio && audio->LockAudio ) { |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
552 audio->LockAudio(audio); |
| 0 | 553 } |
| 554 } | |
| 555 | |
| 556 void SDL_UnlockAudio (void) | |
| 557 { | |
| 558 SDL_AudioDevice *audio = current_audio; | |
| 559 | |
| 560 /* Release lock on the mixing buffers */ | |
|
322
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
561 if ( audio && audio->UnlockAudio ) { |
|
fd93a09655e3
The audio lock and unlock functions are now a part of the driver.
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
562 audio->UnlockAudio(audio); |
| 0 | 563 } |
| 564 } | |
| 565 | |
| 566 void SDL_CloseAudio (void) | |
| 567 { | |
| 568 SDL_QuitSubSystem(SDL_INIT_AUDIO); | |
| 569 } | |
| 570 | |
| 571 void SDL_AudioQuit(void) | |
| 572 { | |
| 573 SDL_AudioDevice *audio = current_audio; | |
| 574 | |
| 575 if ( audio ) { | |
| 576 audio->enabled = 0; | |
| 577 if ( audio->thread != NULL ) { | |
| 578 SDL_WaitThread(audio->thread, NULL); | |
| 579 } | |
| 580 if ( audio->mixer_lock != NULL ) { | |
| 581 SDL_DestroyMutex(audio->mixer_lock); | |
| 582 } | |
| 583 if ( audio->fake_stream != NULL ) { | |
| 584 SDL_FreeAudioMem(audio->fake_stream); | |
| 585 } | |
| 586 if ( audio->convert.needed ) { | |
| 587 SDL_FreeAudioMem(audio->convert.buf); | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
588 |
| 0 | 589 } |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
590 #ifndef ENABLE_AHI |
| 0 | 591 if ( audio->opened ) { |
| 592 audio->CloseAudio(audio); | |
| 593 audio->opened = 0; | |
| 594 } | |
|
21
75a95f82bc1f
Updated the Amiga OS port of SDL (thanks Gabriele)
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
595 #endif |
| 0 | 596 /* Free the driver data */ |
| 597 audio->free(audio); | |
| 598 current_audio = NULL; | |
| 599 } | |
| 600 } | |
| 601 | |
| 602 #define NUM_FORMATS 6 | |
| 603 static int format_idx; | |
| 604 static int format_idx_sub; | |
| 605 static Uint16 format_list[NUM_FORMATS][NUM_FORMATS] = { | |
| 606 { AUDIO_U8, AUDIO_S8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB }, | |
| 607 { AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB }, | |
| 608 { AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8 }, | |
| 609 { AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8 }, | |
| 610 { AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U8, AUDIO_S8 }, | |
| 611 { AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U8, AUDIO_S8 }, | |
| 612 }; | |
| 613 | |
| 614 Uint16 SDL_FirstAudioFormat(Uint16 format) | |
| 615 { | |
| 616 for ( format_idx=0; format_idx < NUM_FORMATS; ++format_idx ) { | |
| 617 if ( format_list[format_idx][0] == format ) { | |
| 618 break; | |
| 619 } | |
| 620 } | |
| 621 format_idx_sub = 0; | |
| 622 return(SDL_NextAudioFormat()); | |
| 623 } | |
| 624 | |
| 625 Uint16 SDL_NextAudioFormat(void) | |
| 626 { | |
| 627 if ( (format_idx == NUM_FORMATS) || (format_idx_sub == NUM_FORMATS) ) { | |
| 628 return(0); | |
| 629 } | |
| 630 return(format_list[format_idx][format_idx_sub++]); | |
| 631 } | |
| 632 | |
| 633 void SDL_CalculateAudioSpec(SDL_AudioSpec *spec) | |
| 634 { | |
| 635 switch (spec->format) { | |
| 636 case AUDIO_U8: | |
| 637 spec->silence = 0x80; | |
| 638 break; | |
| 639 default: | |
| 640 spec->silence = 0x00; | |
| 641 break; | |
| 642 } | |
| 643 spec->size = (spec->format&0xFF)/8; | |
| 644 spec->size *= spec->channels; | |
| 645 spec->size *= spec->samples; | |
| 646 } |