X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_sdl.c;h=21341dce883a6c111b502a2a91113ce9a13b99e8;hp=90b53129c10947a239375d9e0a59ff007a84cb29;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=5a62228b228e2a329d2ba7fef9dacd12de4d9033 diff --git a/snd_sdl.c b/snd_sdl.c index 90b53129..21341dce 100644 --- a/snd_sdl.c +++ b/snd_sdl.c @@ -16,15 +16,16 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include #include #include "quakedef.h" + #include "snd_main.h" static unsigned int sdlaudiotime = 0; +static int audio_device = 0; // Note: SDL calls SDL_LockAudio() right before this function, so no need to lock the audio data here @@ -38,34 +39,48 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len) Sys_Error("SDL sound: invalid buffer length passed to Buffer_Callback (%d bytes)\n", len); RequestedFrames = (unsigned int)len / factor; - - // Transfert up to a chunk of samples from snd_renderbuffer to stream - MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe; - if (MaxFrames > RequestedFrames) - FrameCount = RequestedFrames; - else - FrameCount = MaxFrames; - StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes; - EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes; - if (StartOffset > EndOffset) // if the buffer wraps + + if (SndSys_LockRenderBuffer()) { - unsigned int PartialLength1, PartialLength2; + if (snd_usethreadedmixing) + { + S_MixToBuffer(stream, RequestedFrames); + if (snd_blocked) + memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len); + SndSys_UnlockRenderBuffer(); + return; + } - PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor; - memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1); - - PartialLength2 = FrameCount * factor - PartialLength1; - memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2); - } - else - memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor); + // Transfert up to a chunk of samples from snd_renderbuffer to stream + MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe; + if (MaxFrames > RequestedFrames) + FrameCount = RequestedFrames; + else + FrameCount = MaxFrames; + StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes; + EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes; + if (StartOffset > EndOffset) // if the buffer wraps + { + unsigned int PartialLength1, PartialLength2; - snd_renderbuffer->startframe += FrameCount; + PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor; + memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1); - if (FrameCount < RequestedFrames) - Con_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount); + PartialLength2 = FrameCount * factor - PartialLength1; + memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2); + } + else + memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor); + + snd_renderbuffer->startframe += FrameCount; + + if (FrameCount < RequestedFrames && developer_insane.integer && vid_activewindow) + Con_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount); + + sdlaudiotime += RequestedFrames; - sdlaudiotime += RequestedFrames; + SndSys_UnlockRenderBuffer(); + } } @@ -83,7 +98,9 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) SDL_AudioSpec wantspec; SDL_AudioSpec obtainspec; - Con_Print ("SndSys_Init: using the SDL module\n"); + snd_threaded = false; + + Con_DPrint ("SndSys_Init: using the SDL module\n"); // Init the SDL Audio subsystem if( SDL_InitSubSystem( SDL_INIT_AUDIO ) ) { @@ -91,7 +108,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) return false; } - buffersize = (unsigned int)ceil((double)requested->speed / 20.0); + buffersize = (unsigned int)ceil((double)requested->speed / 25.0); // 2048 bytes on 24kHz to 48kHz // Init the SDL Audio subsystem wantspec.callback = Buffer_Callback; @@ -101,20 +118,20 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) wantspec.channels = requested->channels; wantspec.samples = CeilPowerOf2(buffersize); // needs to be a power of 2 on some platforms. - Con_DPrintf("Wanted audio Specification:\n" + Con_Printf("Wanted audio Specification:\n" "\tChannels : %i\n" "\tFormat : 0x%X\n" "\tFrequency : %i\n" "\tSamples : %i\n", wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples); - if( SDL_OpenAudio( &wantspec, &obtainspec ) ) - { + if ((audio_device = SDL_OpenAudioDevice(NULL, 0, &wantspec, &obtainspec, 0)) == 0) + { Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() ); return false; } - Con_DPrintf("Obtained audio specification:\n" + Con_Printf("Obtained audio specification:\n" "\tChannels : %i\n" "\tFormat : 0x%X\n" "\tFrequency : %i\n" @@ -126,7 +143,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) wantspec.format != obtainspec.format || wantspec.channels != obtainspec.channels) { - SDL_CloseAudio(); + SDL_CloseAudioDevice(audio_device); // Pass the obtained format as a suggested format if (suggested != NULL) @@ -140,17 +157,15 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) return false; } - snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL); + snd_threaded = true; -#ifdef __linux__ - alsaspeakerlayout = true; -#else - alsaspeakerlayout = false; -#endif + snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL); + if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO) + Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD); sdlaudiotime = 0; - SDL_PauseAudio( false ); - + SDL_PauseAudioDevice(audio_device, 0); + return true; } @@ -164,8 +179,10 @@ Stop the sound card, delete "snd_renderbuffer" and free its other resources */ void SndSys_Shutdown(void) { - SDL_CloseAudio(); - + if (audio_device > 0) { + SDL_CloseAudioDevice(audio_device); + audio_device = 0; + } if (snd_renderbuffer != NULL) { Mem_Free(snd_renderbuffer->ring); @@ -210,7 +227,7 @@ Get the exclusive lock on "snd_renderbuffer" */ qboolean SndSys_LockRenderBuffer (void) { - SDL_LockAudio(); + SDL_LockAudioDevice(audio_device); return true; } @@ -224,5 +241,17 @@ Release the exclusive lock on "snd_renderbuffer" */ void SndSys_UnlockRenderBuffer (void) { - SDL_UnlockAudio(); + SDL_UnlockAudioDevice(audio_device); +} + +/* +==================== +SndSys_SendKeyEvents + +Send keyboard events originating from the sound system (e.g. MIDI) +==================== +*/ +void SndSys_SendKeyEvents(void) +{ + // not supported }