sdl-ios-xcode: src/audio/SDL

annotate src/audio/SDL_audio.c @ 2866:e532417a6977

Fixed SDL 1.2 compatibility problem. The API specifies that SDL_OpenAudio() will fill out the 'desired' audio spec with the correct samples and size set by the driver. This value is important since it may be used by applications that size audio buffers, etc. However, we want to allow advanced applications to call SDL_OpenAudioDevice() which gets passed a const 'desired' parameter, and have the correct data filled into the 'obtained' parameter, possibly allowing or not allowing format changes. So... 'obtained' becomes the audio format the user callback is expected to use, and we add flags to allow the application to specify which format changes are allowed. Note: We really need to add a way to query the 'obtained' audio spec.

author	Sam Lantinga <slouken@libsdl.org>
date	Sat, 13 Dec 2008 06:36:47 +0000
parents	99210400e8b9
children	2929ed239d2a

rev	line source
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2765 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1204 diff changeset	6 modify it under the terms of the GNU Lesser General Public
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1204 diff changeset	8 version 2.1 of the License, or (at your option) any later version.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1204 diff changeset	13 Lesser General Public License for more details.
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1204 diff changeset	15 You should have received a copy of the GNU Lesser General Public
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1204 diff changeset	16 License along with this library; if not, write to the Free Software
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 1204 diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	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 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1379 diff changeset	22 #include "SDL_config.h"
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	23
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	24 /* Allow access to a raw mixing buffer */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	25
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26 #include "SDL.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27 #include "SDL_audio_c.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	28 #include "SDL_audiomem.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	29 #include "SDL_sysaudio.h"
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	30
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	31 #define _THIS SDL_AudioDevice *this
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	32
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	33 static SDL_AudioDriver current_audio;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	34 static SDL_AudioDevice *open_devices[16];
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	35
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	36 /* !!! FIXME: These are wordy and unlocalized... */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	37 #define DEFAULT_OUTPUT_DEVNAME "System audio output device"
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	38 #define DEFAULT_INPUT_DEVNAME "System audio capture device"
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	39
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	40
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	41 /*
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	42 * Not all of these will be compiled and linked in, but it's convenient
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	43 * to have a complete list here and saves yet-another block of #ifdefs...
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	44 * Please see bootstrap[], below, for the actual #ifdef mess.
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	45 */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	46 extern AudioBootStrap BSD_AUDIO_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	47 extern AudioBootStrap DSP_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	48 extern AudioBootStrap DMA_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	49 extern AudioBootStrap ALSA_bootstrap;
2271 60b4c52a7906 Ported PulseAudio target from 1.2 to 1.3 interfaces, and added it to the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2147 diff changeset	50 extern AudioBootStrap PULSEAUDIO_bootstrap;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	51 extern AudioBootStrap QNXNTOAUDIO_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	52 extern AudioBootStrap SUNAUDIO_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	53 extern AudioBootStrap DMEDIA_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	54 extern AudioBootStrap ARTS_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	55 extern AudioBootStrap ESD_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	56 extern AudioBootStrap NAS_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	57 extern AudioBootStrap DSOUND_bootstrap;
2070 dbfa1ebd73b0 Fixed building of Windows waveout audio. Ryan C. Gordon <icculus@icculus.org> parents: 2060 diff changeset	58 extern AudioBootStrap WINWAVEOUT_bootstrap;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	59 extern AudioBootStrap PAUDIO_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	60 extern AudioBootStrap BEOSAUDIO_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	61 extern AudioBootStrap COREAUDIO_bootstrap;
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	62 extern AudioBootStrap COREAUDIOIPHONE_bootstrap;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	63 extern AudioBootStrap SNDMGR_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	64 extern AudioBootStrap MINTAUDIO_GSXB_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	65 extern AudioBootStrap MINTAUDIO_MCSN_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	66 extern AudioBootStrap MINTAUDIO_STFA_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	67 extern AudioBootStrap MINTAUDIO_XBIOS_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	68 extern AudioBootStrap MINTAUDIO_DMA8_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	69 extern AudioBootStrap DISKAUD_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	70 extern AudioBootStrap DUMMYAUD_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	71 extern AudioBootStrap DCAUD_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	72 extern AudioBootStrap MMEAUDIO_bootstrap;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	73 extern AudioBootStrap DART_bootstrap;
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	74 extern AudioBootStrap NDSAUD_bootstrap;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	75
1190 173c063d4f55 OS/2 port! Ryan C. Gordon <icculus@icculus.org> parents: 955 diff changeset	76
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	77 /* Available audio drivers */
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	78 static AudioBootStrap *bootstrap[] = {
1567 12b6d331d82a Good idea, renaming OpenBSD audio to BSD audio. Sam Lantinga <slouken@libsdl.org> parents: 1562 diff changeset	79 #if SDL_AUDIO_DRIVER_BSD
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	80 &BSD_AUDIO_bootstrap,
94 ae6e6b73333f Cleaned up the OpenBSD port, thanks to Peter Valchev Sam Lantinga <slouken@lokigames.com> parents: 68 diff changeset	81 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	82 #if SDL_AUDIO_DRIVER_OSS
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	83 &DSP_bootstrap,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	84 &DMA_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	85 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	86 #if SDL_AUDIO_DRIVER_ALSA
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	87 &ALSA_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	88 #endif
2271 60b4c52a7906 Ported PulseAudio target from 1.2 to 1.3 interfaces, and added it to the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2147 diff changeset	89 #if SDL_AUDIO_DRIVER_PULSEAUDIO
2274 aedfcdeb69b6 indent Sam Lantinga <slouken@libsdl.org> parents: 2271 diff changeset	90 &PULSEAUDIO_bootstrap,
2271 60b4c52a7906 Ported PulseAudio target from 1.2 to 1.3 interfaces, and added it to the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2147 diff changeset	91 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	92 #if SDL_AUDIO_DRIVER_QNXNTO
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	93 &QNXNTOAUDIO_bootstrap,
663 8bedd6d61642 Date: Sat, 2 Aug 2003 16:22:51 +0300 Sam Lantinga <slouken@libsdl.org> parents: 654 diff changeset	94 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	95 #if SDL_AUDIO_DRIVER_SUNAUDIO
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	96 &SUNAUDIO_bootstrap,
148 8758b8d42cd9 Audio subsystem no longer assumes sun audio API on UNIX systems Sam Lantinga <slouken@libsdl.org> parents: 121 diff changeset	97 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	98 #if SDL_AUDIO_DRIVER_DMEDIA
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	99 &DMEDIA_bootstrap,
35 d3bc792e136d Added detection of Open Sound System on Solaris x86 Sam Lantinga <slouken@lokigames.com> parents: 21 diff changeset	100 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	101 #if SDL_AUDIO_DRIVER_ARTS
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	102 &ARTS_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	103 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	104 #if SDL_AUDIO_DRIVER_ESD
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	105 &ESD_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	106 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	107 #if SDL_AUDIO_DRIVER_NAS
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	108 &NAS_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	109 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	110 #if SDL_AUDIO_DRIVER_DSOUND
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	111 &DSOUND_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	112 #endif
2070 dbfa1ebd73b0 Fixed building of Windows waveout audio. Ryan C. Gordon <icculus@icculus.org> parents: 2060 diff changeset	113 #if SDL_AUDIO_DRIVER_WINWAVEOUT
dbfa1ebd73b0 Fixed building of Windows waveout audio. Ryan C. Gordon <icculus@icculus.org> parents: 2060 diff changeset	114 &WINWAVEOUT_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	115 #endif
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	116 #if SDL_AUDIO_DRIVER_PAUDIO
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	117 &PAUDIO_bootstrap,
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	118 #endif
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	119 #if SDL_AUDIO_DRIVER_BEOSAUDIO
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	120 &BEOSAUDIO_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	121 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	122 #if SDL_AUDIO_DRIVER_COREAUDIO
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	123 &COREAUDIO_bootstrap,
935 f8d5ddc7aef1 Audio improvements from Max Horn, including a new CoreAudio driver for MacOSX Sam Lantinga <slouken@libsdl.org> parents: 808 diff changeset	124 #endif
2765 f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	125 #if SDL_AUDIO_DRIVER_COREAUDIOIPHONE
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	126 &COREAUDIOIPHONE_bootstrap,
f55c87ae336b Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2735 diff changeset	127 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	128 #if SDL_AUDIO_DRIVER_SNDMGR
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	129 &SNDMGR_bootstrap,
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	130 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	131 #if SDL_AUDIO_DRIVER_MINT
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	132 &MINTAUDIO_GSXB_bootstrap,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	133 &MINTAUDIO_MCSN_bootstrap,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	134 &MINTAUDIO_STFA_bootstrap,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	135 &MINTAUDIO_XBIOS_bootstrap,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	136 &MINTAUDIO_DMA8_bootstrap,
398 d219b0e02f5f Added Atari audio support (thanks Patrice!) Sam Lantinga <slouken@libsdl.org> parents: 322 diff changeset	137 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	138 #if SDL_AUDIO_DRIVER_DISK
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	139 &DISKAUD_bootstrap,
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: 38 diff changeset	140 #endif
1532 30f189cdd82b Implemented dummy audio driver. Ryan C. Gordon <icculus@icculus.org> parents: 1487 diff changeset	141 #if SDL_AUDIO_DRIVER_DUMMY
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	142 &DUMMYAUD_bootstrap,
1532 30f189cdd82b Implemented dummy audio driver. Ryan C. Gordon <icculus@icculus.org> parents: 1487 diff changeset	143 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	144 #if SDL_AUDIO_DRIVER_DC
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	145 &DCAUD_bootstrap,
509 dad72daf44b3 Added initial support for Dreamcast (thanks HERO!) Sam Lantinga <slouken@libsdl.org> parents: 398 diff changeset	146 #endif
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	147 #if SDL_AUDIO_DRIVER_MMEAUDIO
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	148 &MMEAUDIO_bootstrap,
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	149 #endif
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	150 #if SDL_AUDIO_DRIVER_DART
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	151 &DART_bootstrap,
1190 173c063d4f55 OS/2 port! Ryan C. Gordon <icculus@icculus.org> parents: 955 diff changeset	152 #endif
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	153 #if SDL_AUDIO_DRIVER_NDS
204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	154 &NDSAUD_bootstrap,
204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	155 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	156 NULL
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	157 };
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	158
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	159 static SDL_AudioDevice *
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	160 get_audio_device(SDL_AudioDeviceID id)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	161 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	162 id--;
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	163 if ((id >= SDL_arraysize(open_devices)) \|\| (open_devices[id] == NULL)) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	164 SDL_SetError("Invalid audio device ID");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	165 return NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	166 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	167
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	168 return open_devices[id];
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	169 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	170
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	171
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	172 /* stubs for audio drivers that don't need a specific entry point... */
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	173 static int
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	174 SDL_AudioDetectDevices_Default(int iscapture)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	175 {
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	176 return -1;
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	177 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	178
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	179 static void
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	180 SDL_AudioThreadInit_Default(_THIS)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	181 { /* no-op. */
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	182 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	183
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	184 static void
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	185 SDL_AudioWaitDevice_Default(_THIS)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	186 { /* no-op. */
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	187 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	188
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	189 static void
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	190 SDL_AudioPlayDevice_Default(_THIS)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	191 { /* no-op. */
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	192 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	193
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	194 static Uint8 *
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	195 SDL_AudioGetDeviceBuf_Default(_THIS)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	196 {
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	197 return NULL;
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	198 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	199
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	200 static void
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	201 SDL_AudioWaitDone_Default(_THIS)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	202 { /* no-op. */
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	203 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	204
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	205 static void
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	206 SDL_AudioCloseDevice_Default(_THIS)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	207 { /* no-op. */
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	208 }
2735 204be4fc2726 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	209
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	210 static void
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	211 SDL_AudioDeinitialize_Default(void)
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	212 { /* no-op. */
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	213 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	214
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	215 static int
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	216 SDL_AudioOpenDevice_Default(_THIS, const char *devname, int iscapture)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	217 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	218 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	219 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	220
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	221 static const char *
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	222 SDL_AudioGetDeviceName_Default(int index, int iscapture)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	223 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	224 SDL_SetError("No such device");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	225 return NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	226 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	227
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	228 static void
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	229 SDL_AudioLockDevice_Default(SDL_AudioDevice * device)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	230 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	231 if (device->thread && (SDL_ThreadID() == device->threadid)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	232 return;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	233 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	234 SDL_mutexP(device->mixer_lock);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	235 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	236
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	237 static void
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	238 SDL_AudioUnlockDevice_Default(SDL_AudioDevice * device)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	239 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	240 if (device->thread && (SDL_ThreadID() == device->threadid)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	241 return;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	242 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	243 SDL_mutexV(device->mixer_lock);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	244 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	245
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	246
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	247 static void
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	248 finalize_audio_entry_points(void)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	249 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	250 /*
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	251 * Fill in stub functions for unused driver entry points. This lets us
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	252 * blindly call them without having to check for validity first.
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	253 */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	254
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	255 #define FILL_STUB(x) \
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	256 if (current_audio.impl.x == NULL) { \
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	257 current_audio.impl.x = SDL_Audio##x##_Default; \
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	258 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	259 FILL_STUB(DetectDevices);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	260 FILL_STUB(GetDeviceName);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	261 FILL_STUB(OpenDevice);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	262 FILL_STUB(ThreadInit);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	263 FILL_STUB(WaitDevice);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	264 FILL_STUB(PlayDevice);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	265 FILL_STUB(GetDeviceBuf);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	266 FILL_STUB(WaitDone);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	267 FILL_STUB(CloseDevice);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	268 FILL_STUB(LockDevice);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	269 FILL_STUB(UnlockDevice);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	270 FILL_STUB(Deinitialize);
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	271 #undef FILL_STUB
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	272 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	273
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	274 /* Streaming functions (for when the input and output buffer sizes are different) */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	275 /* Write [length] bytes from buf into the streamer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	276 void
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	277 SDL_StreamWrite(SDL_AudioStreamer * stream, Uint8 * buf, int length)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	278 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	279 int i;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	280
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	281 for (i = 0; i < length; ++i) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	282 stream->buffer[stream->write_pos] = buf[i];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	283 ++stream->write_pos;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	284 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	285 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	286
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	287 /* Read [length] bytes out of the streamer into buf */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	288 void
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	289 SDL_StreamRead(SDL_AudioStreamer * stream, Uint8 * buf, int length)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	290 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	291 int i;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	292
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	293 for (i = 0; i < length; ++i) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	294 buf[i] = stream->buffer[stream->read_pos];
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	295 ++stream->read_pos;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	296 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	297 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	298
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	299 int
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	300 SDL_StreamLength(SDL_AudioStreamer * stream)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	301 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	302 return (stream->write_pos - stream->read_pos) % stream->max_len;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	303 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	304
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	305 /* Initialize the stream by allocating the buffer and setting the read/write heads to the beginning */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	306 int
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	307 SDL_StreamInit(SDL_AudioStreamer * stream, int max_len, Uint8 silence)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	308 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	309 /* First try to allocate the buffer */
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	310 stream->buffer = (Uint8 *) SDL_malloc(max_len);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	311 if (stream->buffer == NULL) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	312 return -1;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	313 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	314
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	315 stream->max_len = max_len;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	316 stream->read_pos = 0;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	317 stream->write_pos = 0;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	318
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	319 /* Zero out the buffer */
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	320 SDL_memset(stream->buffer, silence, max_len);
2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	321
2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	322 return 0;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	323 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	324
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	325 /* Deinitialize the stream simply by freeing the buffer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	326 void
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	327 SDL_StreamDeinit(SDL_AudioStreamer * stream)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	328 {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	329 if (stream->buffer != NULL) {
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2716 diff changeset	330 SDL_free(stream->buffer);
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	331 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	332 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	333
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	334
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	335 /* The general mixing thread function */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	336 int SDLCALL
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	337 SDL_RunAudio(void *devicep)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	338 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	339 SDL_AudioDevice device = (SDL_AudioDevice ) devicep;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	340 Uint8 *stream;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	341 int stream_len;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	342 void *udata;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	343 void (SDLCALL * fill) (void userdata, Uint8 stream, int len);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	344 int silence;
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	345 int stream_max_len;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	346
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	347 /* For streaming when the buffer sizes don't match up */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	348 Uint8 *istream;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	349 int istream_len;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	350
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	351 /* Perform any thread setup */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	352 device->threadid = SDL_ThreadID();
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	353 current_audio.impl.ThreadInit(device);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	354
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	355 /* Set up the mixing function */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	356 fill = device->spec.callback;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	357 udata = device->spec.userdata;
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	358
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	359 /* By default do not stream */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	360 device->use_streamer = 0;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	361
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	362 if (device->convert.needed) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	363 if (device->convert.src_format == AUDIO_U8) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	364 silence = 0x80;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	365 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	366 silence = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	367 }
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	368
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	369 /* If the result of the conversion alters the length, i.e. resampling is being used, use the streamer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	370 if (device->convert.len_mult != 1 \|\| device->convert.len_div != 1) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	371 /* The streamer's maximum length should be twice whichever is larger: spec.size or len_cvt */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	372 stream_max_len = 2 * device->spec.size;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	373 if (device->convert.len_mult > device->convert.len_div) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	374 stream_max_len *= device->convert.len_mult;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	375 stream_max_len /= device->convert.len_div;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	376 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	377 if (SDL_StreamInit(&device->streamer, stream_max_len, silence) <
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	378 0)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	379 return -1;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	380 device->use_streamer = 1;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	381
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	382 /* istream_len should be the length of what we grab from the callback and feed to conversion,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	383 so that we get close to spec_size. I.e. we want device.spec_size = istream_len * u / d
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	384 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	385 istream_len =
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	386 device->spec.size * device->convert.len_div /
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	387 device->convert.len_mult;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	388 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	389
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	390 /* stream_len = device->convert.len; */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	391 stream_len = device->spec.size;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	392 } else {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	393 silence = device->spec.silence;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	394 stream_len = device->spec.size;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	395 }
1561 c724c4a99759 Try to fill the hardware audio buffer immediately. Ryan C. Gordon <icculus@icculus.org> parents: 1532 diff changeset	396
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	397 /* Determine if the streamer is necessary here */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	398 if (device->use_streamer == 1) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	399 /* This code is almost the same as the old code. The difference is, instead of reding
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	400 directly from the callback into "stream", then converting and sending the audio off,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	401 we go: callback -> "istream" -> (conversion) -> streamer -> stream -> device.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	402 However, reading and writing with streamer are done separately:
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	403 - We only call the callback and write to the streamer when the streamer does not
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	404 contain enough samples to output to the device.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	405 - We only read from the streamer and tell the device to play when the streamer
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	406 does have enough samples to output.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	407 This allows us to perform resampling in the conversion step, where the output of the
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	408 resampling process can be any number. We will have to see what a good size for the
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	409 stream's maximum length is, but I suspect 2*max(len_cvt, stream_len) is a good figure.
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	410 */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	411 while (device->enabled) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	412 /* Only read in audio if the streamer doesn't have enough already (if it does not have enough samples to output) */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	413 if (SDL_StreamLength(&device->streamer) < stream_len) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	414 /* Set up istream */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	415 if (device->convert.needed) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	416 if (device->convert.buf) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	417 istream = device->convert.buf;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	418 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	419 continue;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	420 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	421 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	422 istream = current_audio.impl.GetDeviceBuf(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	423 if (istream == NULL) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	424 istream = device->fake_stream;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	425 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	426 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	427
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	428 /* Read from the callback into the _input_ stream */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	429 if (!device->paused) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	430 SDL_mutexP(device->mixer_lock);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	431 (*fill) (udata, istream, istream_len);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	432 SDL_mutexV(device->mixer_lock);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	433 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	434
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	435 /* Convert the audio if necessary and write to the streamer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	436 if (device->convert.needed) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	437 SDL_ConvertAudio(&device->convert);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	438 if (istream == NULL) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	439 istream = device->fake_stream;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	440 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	441 /SDL_memcpy(istream, device->convert.buf, device->convert.len_cvt); /
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	442 SDL_StreamWrite(&device->streamer, device->convert.buf,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	443 device->convert.len_cvt);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	444 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	445 SDL_StreamWrite(&device->streamer, istream, istream_len);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	446 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	447 }
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	448
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	449 /* Only output audio if the streamer has enough to output */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	450 if (SDL_StreamLength(&device->streamer) >= stream_len) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	451 /* Set up the output stream */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	452 if (device->convert.needed) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	453 if (device->convert.buf) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	454 stream = device->convert.buf;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	455 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	456 continue;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	457 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	458 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	459 stream = current_audio.impl.GetDeviceBuf(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	460 if (stream == NULL) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	461 stream = device->fake_stream;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	462 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	463 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	464
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	465 /* Now read from the streamer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	466 SDL_StreamRead(&device->streamer, stream, stream_len);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	467
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	468 /* Ready current buffer for play and change current buffer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	469 if (stream != device->fake_stream) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	470 current_audio.impl.PlayDevice(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	471 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	472
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	473 /* Wait for an audio buffer to become available */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	474 if (stream == device->fake_stream) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	475 SDL_Delay((device->spec.samples * 1000) /
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	476 device->spec.freq);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	477 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	478 current_audio.impl.WaitDevice(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	479 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	480 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	481
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	482 }
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	483 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	484 /* Otherwise, do not use the streamer. This is the old code. */
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	485
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	486 /* Loop, filling the audio buffers */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	487 while (device->enabled) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	488
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	489 /* Fill the current buffer with sound */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	490 if (device->convert.needed) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	491 if (device->convert.buf) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	492 stream = device->convert.buf;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	493 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	494 continue;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	495 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	496 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	497 stream = current_audio.impl.GetDeviceBuf(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	498 if (stream == NULL) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	499 stream = device->fake_stream;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	500 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	501 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	502
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	503 if (!device->paused) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	504 SDL_mutexP(device->mixer_lock);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	505 (*fill) (udata, stream, stream_len);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	506 SDL_mutexV(device->mixer_lock);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	507 }
1562 1d487a3fab41 Fixed bug #18 Sam Lantinga <slouken@libsdl.org> parents: 1561 diff changeset	508
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	509 /* Convert the audio if necessary */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	510 if (device->convert.needed) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	511 SDL_ConvertAudio(&device->convert);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	512 stream = current_audio.impl.GetDeviceBuf(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	513 if (stream == NULL) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	514 stream = device->fake_stream;
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	515 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	516 SDL_memcpy(stream, device->convert.buf,
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	517 device->convert.len_cvt);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	518 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	519
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	520 /* Ready current buffer for play and change current buffer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	521 if (stream != device->fake_stream) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	522 current_audio.impl.PlayDevice(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	523 }
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	524
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	525 /* Wait for an audio buffer to become available */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	526 if (stream == device->fake_stream) {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	527 SDL_Delay((device->spec.samples * 1000) / device->spec.freq);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	528 } else {
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	529 current_audio.impl.WaitDevice(device);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	530 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	531 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	532 }
1562 1d487a3fab41 Fixed bug #18 Sam Lantinga <slouken@libsdl.org> parents: 1561 diff changeset	533
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	534 /* Wait for the audio to drain.. */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	535 current_audio.impl.WaitDone(device);
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	536
2716 f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	537 /* If necessary, deinit the streamer */
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	538 if (device->use_streamer == 1)
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	539 SDL_StreamDeinit(&device->streamer);
f8f68f47285a Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2274 diff changeset	540
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	541 return (0);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	542 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	543
322 fd93a09655e3 The audio lock and unlock functions are now a part of the driver. Sam Lantinga <slouken@libsdl.org> parents: 297 diff changeset	544
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	545 static SDL_AudioFormat
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	546 SDL_ParseAudioFormat(const char *string)
1794 5605a9820134 Fixed bug #137 Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	547 {
2076 939420dee849 Use SDL_strcmp(), not strcmp(). Ryan C. Gordon <icculus@icculus.org> parents: 2070 diff changeset	548 #define CHECK_FMT_STRING(x) if (SDL_strcmp(string, #x) == 0) return AUDIO_##x
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	549 CHECK_FMT_STRING(U8);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	550 CHECK_FMT_STRING(S8);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	551 CHECK_FMT_STRING(U16LSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	552 CHECK_FMT_STRING(S16LSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	553 CHECK_FMT_STRING(U16MSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	554 CHECK_FMT_STRING(S16MSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	555 CHECK_FMT_STRING(U16SYS);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	556 CHECK_FMT_STRING(S16SYS);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	557 CHECK_FMT_STRING(U16);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	558 CHECK_FMT_STRING(S16);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	559 CHECK_FMT_STRING(S32LSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	560 CHECK_FMT_STRING(S32MSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	561 CHECK_FMT_STRING(S32SYS);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	562 CHECK_FMT_STRING(S32);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	563 CHECK_FMT_STRING(F32LSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	564 CHECK_FMT_STRING(F32MSB);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	565 CHECK_FMT_STRING(F32SYS);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	566 CHECK_FMT_STRING(F32);
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	567 #undef CHECK_FMT_STRING
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	568 return 0;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	569 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	570
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	571 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	572 SDL_GetNumAudioDrivers(void)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	573 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	574 return (SDL_arraysize(bootstrap) - 1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	575 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	576
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	577 const char *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	578 SDL_GetAudioDriver(int index)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	579 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	580 if (index >= 0 && index < SDL_GetNumAudioDrivers()) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	581 return (bootstrap[index]->name);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	582 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	583 return (NULL);
1794 5605a9820134 Fixed bug #137 Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	584 }
5605a9820134 Fixed bug #137 Sam Lantinga <slouken@libsdl.org> parents: 1769 diff changeset	585
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	586 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	587 SDL_AudioInit(const char *driver_name)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	588 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	589 int i = 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	590 int initialized = 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	591 int tried_to_init = 0;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	592
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	593 if (SDL_WasInit(SDL_INIT_AUDIO)) {
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	594 SDL_AudioQuit(); /* shutdown driver if already running. */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	595 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	596
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	597 SDL_memset(&current_audio, '\0', sizeof(current_audio));
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	598 SDL_memset(open_devices, '\0', sizeof(open_devices));
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	599
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	600 /* Select the proper audio driver */
1909 8f1ab2f7c722 Look at environment variables in SDL_VideoInit() and SDL_AudioInit() Sam Lantinga <slouken@libsdl.org> parents: 1903 diff changeset	601 if (driver_name == NULL) {
8f1ab2f7c722 Look at environment variables in SDL_VideoInit() and SDL_AudioInit() Sam Lantinga <slouken@libsdl.org> parents: 1903 diff changeset	602 driver_name = SDL_getenv("SDL_AUDIODRIVER");
8f1ab2f7c722 Look at environment variables in SDL_VideoInit() and SDL_AudioInit() Sam Lantinga <slouken@libsdl.org> parents: 1903 diff changeset	603 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	604
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	605 for (i = 0; (!initialized) && (bootstrap[i]); ++i) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	606 /* make sure we should even try this driver before doing so... */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	607 const AudioBootStrap *backend = bootstrap[i];
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	608 if (((driver_name) && (SDL_strcasecmp(backend->name, driver_name))) \|\|
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	609 ((!driver_name) && (backend->demand_only))) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	610 continue;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	611 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	612
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	613 tried_to_init = 1;
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	614 SDL_memset(&current_audio, 0, sizeof(current_audio));
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	615 current_audio.name = backend->name;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	616 current_audio.desc = backend->desc;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	617 initialized = backend->init(&current_audio.impl);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	618 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	619
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	620 if (!initialized) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	621 /* specific drivers will set the error message if they fail... */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	622 if (!tried_to_init) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	623 if (driver_name) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	624 SDL_SetError("%s not available", driver_name);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	625 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	626 SDL_SetError("No available audio device");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	627 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	628 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	629
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	630 SDL_memset(&current_audio, 0, sizeof(current_audio));
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	631 return (-1); /* No driver was available, so fail. */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	632 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	633
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	634 finalize_audio_entry_points();
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	635
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	636 return (0);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	637 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	638
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	639 /*
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	640 * Get the current audio driver name
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	641 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	642 const char *
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	643 SDL_GetCurrentAudioDriver()
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	644 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	645 return current_audio.name;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	646 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	647
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	648
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	649 int
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	650 SDL_GetNumAudioDevices(int iscapture)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	651 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	652 if (!SDL_WasInit(SDL_INIT_AUDIO)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	653 return -1;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	654 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	655 if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	656 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	657 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	658
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	659 if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	660 return 1;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	661 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	662
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	663 if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	664 return 1;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	665 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	666
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	667 return current_audio.impl.DetectDevices(iscapture);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	668 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	669
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	670
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	671 const char *
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	672 SDL_GetAudioDeviceName(int index, int iscapture)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	673 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	674 if (!SDL_WasInit(SDL_INIT_AUDIO)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	675 SDL_SetError("Audio subsystem is not initialized");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	676 return NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	677 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	678
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	679 if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	680 SDL_SetError("No capture support");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	681 return NULL;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	682 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	683
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	684 if (index < 0) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	685 SDL_SetError("No such device");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	686 return NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	687 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	688
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	689 if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	690 return DEFAULT_INPUT_DEVNAME;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	691 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	692
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	693 if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	694 return DEFAULT_OUTPUT_DEVNAME;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	695 }
262 ba5363e21df8 Don't allow multiple audio opens to succeed (until SDL 1.3) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	696
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	697 return current_audio.impl.GetDeviceName(index, iscapture);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	698 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	699
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	700
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	701 static void
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	702 close_audio_device(SDL_AudioDevice * device)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	703 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	704 device->enabled = 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	705 if (device->thread != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	706 SDL_WaitThread(device->thread, NULL);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	707 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	708 if (device->mixer_lock != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	709 SDL_DestroyMutex(device->mixer_lock);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	710 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	711 if (device->fake_stream != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	712 SDL_FreeAudioMem(device->fake_stream);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	713 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	714 if (device->convert.needed) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	715 SDL_FreeAudioMem(device->convert.buf);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	716 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	717 if (device->opened) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	718 current_audio.impl.CloseDevice(device);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	719 device->opened = 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	720 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	721 SDL_FreeAudioMem(device);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	722 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	723
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	724
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	725 /*
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	726 * Sanity check desired AudioSpec for SDL_OpenAudio() in (orig).
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	727 * Fills in a sanitized copy in (prepared).
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	728 * Returns non-zero if okay, zero on fatal parameters in (orig).
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	729 */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	730 static int
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	731 prepare_audiospec(const SDL_AudioSpec * orig, SDL_AudioSpec * prepared)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	732 {
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	733 SDL_memcpy(prepared, orig, sizeof(SDL_AudioSpec));
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	734
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	735 if (orig->callback == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	736 SDL_SetError("SDL_OpenAudio() passed a NULL callback");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	737 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	738 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	739
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	740 if (orig->freq == 0) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	741 const char *env = SDL_getenv("SDL_AUDIO_FREQUENCY");
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	742 if ((!env) \|\| ((prepared->freq = SDL_atoi(env)) == 0)) {
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	743 prepared->freq = 22050; /* a reasonable default */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	744 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	745 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	746
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	747 if (orig->format == 0) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	748 const char *env = SDL_getenv("SDL_AUDIO_FORMAT");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	749 if ((!env) \|\| ((prepared->format = SDL_ParseAudioFormat(env)) == 0)) {
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	750 prepared->format = AUDIO_S16; /* a reasonable default */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	751 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	752 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	753
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	754 switch (orig->channels) {
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	755 case 0:{
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	756 const char *env = SDL_getenv("SDL_AUDIO_CHANNELS");
2141 e1a70460c354 stupid indent Sam Lantinga <slouken@libsdl.org> parents: 2130 diff changeset	757 if ((!env) \|\| ((prepared->channels = (Uint8) SDL_atoi(env)) == 0)) {
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	758 prepared->channels = 2; /* a reasonable default */
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	759 }
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	760 break;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	761 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	762 case 1: /* Mono */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	763 case 2: /* Stereo */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	764 case 4: /* surround */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	765 case 6: /* surround with center and lfe */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	766 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	767 default:
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	768 SDL_SetError("Unsupported number of audio channels.");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	769 return 0;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	770 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	771
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	772 if (orig->samples == 0) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	773 const char *env = SDL_getenv("SDL_AUDIO_SAMPLES");
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	774 if ((!env) \|\| ((prepared->samples = (Uint16) SDL_atoi(env)) == 0)) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	775 /* Pick a default of ~46 ms at desired frequency */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	776 /* !!! FIXME: remove this when the non-Po2 resampling is in. */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	777 const int samples = (prepared->freq / 1000) * 46;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	778 int power2 = 1;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	779 while (power2 < samples) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	780 power2 *= 2;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	781 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	782 prepared->samples = power2;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	783 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	784 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	785
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	786 /* Calculate the silence and size of the audio specification */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	787 SDL_CalculateAudioSpec(prepared);
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	788
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	789 return 1;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	790 }
1408 ceb5c2fec4f1 Fixed some preprocessor mangling Sam Lantinga <slouken@libsdl.org> parents: 1406 diff changeset	791
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	792
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	793 static SDL_AudioDeviceID
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	794 open_audio_device(const char *devname, int iscapture,
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	795 const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	796 int allowed_changes, int min_id)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	797 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	798 SDL_AudioDeviceID id = 0;
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	799 SDL_AudioSpec _obtained;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	800 SDL_AudioDevice *device;
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	801 SDL_bool build_cvt;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	802 int i = 0;
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	803
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	804 if (!SDL_WasInit(SDL_INIT_AUDIO)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	805 SDL_SetError("Audio subsystem is not initialized");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	806 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	807 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	808
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	809 if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	810 SDL_SetError("No capture support");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	811 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	812 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	813
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	814 if (!obtained) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	815 obtained = &_obtained;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	816 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	817 if (!prepare_audiospec(desired, obtained)) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	818 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	819 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	820
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	821 /* If app doesn't care about a specific device, let the user override. */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	822 if (devname == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	823 devname = SDL_getenv("SDL_AUDIO_DEVICE_NAME");
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	824 }
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	825
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	826 /*
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	827 * Catch device names at the high level for the simple case...
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	828 * This lets us have a basic "device enumeration" for systems that
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	829 * don't have multiple devices, but makes sure the device name is
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	830 * always NULL when it hits the low level.
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	831 *
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	832 * Also make sure that the simple case prevents multiple simultaneous
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	833 * opens of the default system device.
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	834 */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	835
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	836 if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	837 if ((devname) && (SDL_strcmp(devname, DEFAULT_INPUT_DEVNAME) != 0)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	838 SDL_SetError("No such device");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	839 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	840 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	841 devname = NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	842
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	843 for (i = 0; i < SDL_arraysize(open_devices); i++) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	844 if ((open_devices[i]) && (open_devices[i]->iscapture)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	845 SDL_SetError("Audio device already open");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	846 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	847 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	848 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	849 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	850
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	851 if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	852 if ((devname) && (SDL_strcmp(devname, DEFAULT_OUTPUT_DEVNAME) != 0)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	853 SDL_SetError("No such device");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	854 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	855 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	856 devname = NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	857
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	858 for (i = 0; i < SDL_arraysize(open_devices); i++) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	859 if ((open_devices[i]) && (!open_devices[i]->iscapture)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	860 SDL_SetError("Audio device already open");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	861 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	862 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	863 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	864 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	865
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	866 device = (SDL_AudioDevice *) SDL_AllocAudioMem(sizeof(SDL_AudioDevice));
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	867 if (device == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	868 SDL_OutOfMemory();
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	869 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	870 }
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	871 SDL_memset(device, '\0', sizeof(SDL_AudioDevice));
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	872 device->spec = *obtained;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	873 device->enabled = 1;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	874 device->paused = 1;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	875 device->iscapture = iscapture;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	876
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	877 /* Create a semaphore for locking the sound buffers */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	878 if (!current_audio.impl.SkipMixerLock) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	879 device->mixer_lock = SDL_CreateMutex();
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	880 if (device->mixer_lock == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	881 close_audio_device(device);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	882 SDL_SetError("Couldn't create mixer lock");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	883 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	884 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	885 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	886
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	887 if (!current_audio.impl.OpenDevice(device, devname, iscapture)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	888 close_audio_device(device);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	889 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	890 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	891 device->opened = 1;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	892
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	893 /* Allocate a fake audio memory buffer */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	894 device->fake_stream = SDL_AllocAudioMem(device->spec.size);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	895 if (device->fake_stream == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	896 close_audio_device(device);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	897 SDL_OutOfMemory();
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	898 return 0;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	899 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	900
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	901 /* If the audio driver changes the buffer size, accept it */
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	902 if (device->spec.samples != obtained->samples) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	903 obtained->samples = device->spec.samples;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	904 SDL_CalculateAudioSpec(obtained);
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	905 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	906
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	907 /* See if we need to do any conversion */
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	908 build_cvt = SDL_FALSE;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	909 if (obtained->freq != device->spec.freq) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	910 if (allowed_changes & SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	911 obtained->freq = device->spec.freq;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	912 } else {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	913 build_cvt = SDL_TRUE;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	914 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	915 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	916 if (obtained->format != device->spec.format) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	917 if (allowed_changes & SDL_AUDIO_ALLOW_FORMAT_CHANGE) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	918 obtained->format = device->spec.format;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	919 } else {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	920 build_cvt = SDL_TRUE;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	921 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	922 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	923 if (obtained->channels != device->spec.channels) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	924 if (allowed_changes & SDL_AUDIO_ALLOW_CHANNELS_CHANGE) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	925 obtained->channels = device->spec.channels;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	926 } else {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	927 build_cvt = SDL_TRUE;
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	928 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	929 }
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	930 if (build_cvt) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	931 /* Build an audio conversion block */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	932 if (SDL_BuildAudioCVT(&device->convert,
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	933 obtained->format, obtained->channels,
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	934 obtained->freq,
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	935 device->spec.format, device->spec.channels,
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	936 device->spec.freq) < 0) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	937 close_audio_device(device);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	938 return 0;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	939 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	940 if (device->convert.needed) {
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	941 device->convert.len = (int) (((double) obtained->size) /
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	942 device->convert.len_ratio);
2053 716cf90f24a0 1.3 branch version of revision 2878. Ryan C. Gordon <icculus@icculus.org> parents: 2049 diff changeset	943
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	944 device->convert.buf =
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	945 (Uint8 ) SDL_AllocAudioMem(device->convert.len
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	946 device->convert.len_mult);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	947 if (device->convert.buf == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	948 close_audio_device(device);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	949 SDL_OutOfMemory();
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	950 return 0;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	951 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	952 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	953 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	954
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	955 /* Find an available device ID and store the structure... */
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	956 for (id = min_id - 1; id < SDL_arraysize(open_devices); id++) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	957 if (open_devices[id] == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	958 open_devices[id] = device;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	959 break;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	960 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	961 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	962
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	963 if (id == SDL_arraysize(open_devices)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	964 SDL_SetError("Too many open audio devices");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	965 close_audio_device(device);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	966 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	967 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	968
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	969 /* Start the audio thread if necessary */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	970 if (!current_audio.impl.ProvidesOwnCallbackThread) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	971 /* Start the audio thread */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	972 /* !!! FIXME: this is nasty. */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1379 diff changeset	973 #if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
1330 450721ad5436 It's now possible to build SDL without any C runtime at all on Windows, Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	974 #undef SDL_CreateThread
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	975 device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL);
1330 450721ad5436 It's now possible to build SDL without any C runtime at all on Windows, Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	976 #else
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	977 device->thread = SDL_CreateThread(SDL_RunAudio, device);
1330 450721ad5436 It's now possible to build SDL without any C runtime at all on Windows, Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	978 #endif
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	979 if (device->thread == NULL) {
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	980 SDL_CloseAudioDevice(id + 1);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	981 SDL_SetError("Couldn't create audio thread");
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	982 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	983 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	984 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	985
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	986 return id + 1;
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	987 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	988
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	989
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	990 int
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	991 SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	992 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	993 SDL_AudioDeviceID id = 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	994
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	995 /* Start up the audio driver, if necessary. This is legacy behaviour! */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	996 if (!SDL_WasInit(SDL_INIT_AUDIO)) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	997 if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	998 return (-1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	999 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1000 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1001
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1002 /* SDL_OpenAudio() is legacy and can only act on Device ID #1. */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1003 if (open_devices[0] != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1004 SDL_SetError("Audio device is already opened");
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1005 return (-1);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1006 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1007
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1008 if (obtained) {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1009 id = open_audio_device(NULL, 0, desired, obtained,
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1010 SDL_AUDIO_ALLOW_ANY_CHANGE, 1);
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1011 } else {
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1012 id = open_audio_device(NULL, 0, desired, desired, 0, 1);
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1013 }
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	1014 if (id > 1) { /* this should never happen in theory... */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1015 SDL_CloseAudioDevice(id);
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	1016 SDL_SetError("Internal error"); /* MUST be Device ID #1! */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1017 return (-1);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1018 }
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	1019
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1020 return ((id == 0) ? -1 : 0);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1021 }
21 75a95f82bc1f Updated the Amiga OS port of SDL (thanks Gabriele) Sam Lantinga <slouken@lokigames.com> parents: 0 diff changeset	1022
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1023 SDL_AudioDeviceID
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1024 SDL_OpenAudioDevice(const char *device, int iscapture,
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1025 const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1026 int allowed_changes)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1027 {
2866 e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1028 return open_audio_device(device, iscapture, desired, obtained,
e532417a6977 Fixed SDL 1.2 compatibility problem. Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1029 allowed_changes, 2);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1030 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1031
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1032 SDL_audiostatus
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1033 SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid)
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1034 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1035 SDL_AudioDevice *device = get_audio_device(devid);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1036 SDL_audiostatus status = SDL_AUDIO_STOPPED;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1037 if (device && device->enabled) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1038 if (device->paused) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1039 status = SDL_AUDIO_PAUSED;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1040 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1041 status = SDL_AUDIO_PLAYING;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1042 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1043 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1044 return (status);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1045 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1046
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1047
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1048 SDL_audiostatus
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1049 SDL_GetAudioStatus(void)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1050 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1051 return SDL_GetAudioDeviceStatus(1);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1052 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1053
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1054 void
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1055 SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1056 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1057 SDL_AudioDevice *device = get_audio_device(devid);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1058 if (device) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1059 device->paused = pause_on;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1060 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1061 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1062
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1063 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1064 SDL_PauseAudio(int pause_on)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1065 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1066 SDL_PauseAudioDevice(1, pause_on);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1067 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1068
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1069
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1070 void
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1071 SDL_LockAudioDevice(SDL_AudioDeviceID devid)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1072 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1073 /* Obtain a lock on the mixing buffers */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1074 SDL_AudioDevice *device = get_audio_device(devid);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1075 if (device) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1076 current_audio.impl.LockDevice(device);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1077 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1078 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1079
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1080 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1081 SDL_LockAudio(void)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1082 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1083 SDL_LockAudioDevice(1);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1084 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1085
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1086 void
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1087 SDL_UnlockAudioDevice(SDL_AudioDeviceID devid)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1088 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1089 /* Obtain a lock on the mixing buffers */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1090 SDL_AudioDevice *device = get_audio_device(devid);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1091 if (device) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1092 current_audio.impl.UnlockDevice(device);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1093 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1094 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1095
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1096 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1097 SDL_UnlockAudio(void)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1098 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1099 SDL_UnlockAudioDevice(1);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1100 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1101
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1102 void
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1103 SDL_CloseAudioDevice(SDL_AudioDeviceID devid)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1104 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1105 SDL_AudioDevice *device = get_audio_device(devid);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1106 if (device) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1107 close_audio_device(device);
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	1108 open_devices[devid - 1] = NULL;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1109 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1110 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1111
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1112 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1113 SDL_CloseAudio(void)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1114 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1115 SDL_CloseAudioDevice(1);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1116 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1117
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1118 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1119 SDL_AudioQuit(void)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1120 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1121 SDL_AudioDeviceID i;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1122 for (i = 0; i < SDL_arraysize(open_devices); i++) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1123 SDL_CloseAudioDevice(i);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1124 }
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1125
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1126 /* Free the driver data */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1127 current_audio.impl.Deinitialize();
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	1128 SDL_memset(&current_audio, '\0', sizeof(current_audio));
866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2053 diff changeset	1129 SDL_memset(open_devices, '\0', sizeof(open_devices));
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1130 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1131
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1132 #define NUM_FORMATS 10
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1133 static int format_idx;
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1134 static int format_idx_sub;
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1135 static SDL_AudioFormat format_list[NUM_FORMATS][NUM_FORMATS] = {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1136 {AUDIO_U8, AUDIO_S8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1137 AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB},
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1138 {AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1139 AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB},
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1140 {AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S32LSB,
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1141 AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8},
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1142 {AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S32MSB,
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1143 AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8},
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1144 {AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_S32LSB,
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1145 AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8},
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1146 {AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_S32MSB,
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1147 AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8},
1993 7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1148 {AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S16LSB,
7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1149 AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8},
7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1150 {AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S16MSB,
7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1151 AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8},
7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1152 {AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_S16LSB,
7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1153 AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8},
7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1154 {AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_S16MSB,
7a3889fc9e5d Reordered the favored audio format list a little. Ryan C. Gordon <icculus@icculus.org> parents: 1982 diff changeset	1155 AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8},
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1156 };
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1157
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1158 SDL_AudioFormat
3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1159 SDL_FirstAudioFormat(SDL_AudioFormat format)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1160 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1161 for (format_idx = 0; format_idx < NUM_FORMATS; ++format_idx) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1162 if (format_list[format_idx][0] == format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1163 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1164 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1165 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1166 format_idx_sub = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1167 return (SDL_NextAudioFormat());
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1168 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1169
1982 3b4ce57c6215 First shot at new audio data types (int32 and float32). Ryan C. Gordon <icculus@icculus.org> parents: 1978 diff changeset	1170 SDL_AudioFormat
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1171 SDL_NextAudioFormat(void)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1172 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1173 if ((format_idx == NUM_FORMATS) \|\| (format_idx_sub == NUM_FORMATS)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1174 return (0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1175 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1176 return (format_list[format_idx][format_idx_sub++]);
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1177 }
74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1178
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1179 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1180 SDL_CalculateAudioSpec(SDL_AudioSpec * spec)
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1181 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1182 switch (spec->format) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1183 case AUDIO_U8:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1184 spec->silence = 0x80;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1185 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1186 default:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1187 spec->silence = 0x00;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1188 break;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1189 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1190 spec->size = SDL_AUDIO_BITSIZE(spec->format) / 8;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1191 spec->size *= spec->channels;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1192 spec->size *= spec->samples;
0 74212992fb08 Initial revision Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1193 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1194
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1195
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1196 /*
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1197 * Moved here from SDL_mixer.c, since it relies on internals of an opened
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1198 * audio device (and is deprecated, by the way!).
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1199 */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1200 void
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1201 SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume)
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1202 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1203 /* Mix the user-level audio format */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1204 SDL_AudioDevice *device = get_audio_device(1);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1205 if (device != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1206 SDL_AudioFormat format;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1207 if (device->convert.needed) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1208 format = device->convert.src_format;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1209 } else {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1210 format = device->spec.format;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1211 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1212 SDL_MixAudioFormat(dst, src, format, len, volume);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1213 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1214 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 2045 diff changeset	1215
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1794 diff changeset	1216 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/audio/SDL_audio.c @ 2866:e532417a6977