X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_sdl.c;h=e93d302113f31e5cb509faa5f5824c584ae21a1f;hp=01f1bdcddc3633cd9e1ad12e25ccf88532c67d7d;hb=HEAD;hpb=88e57bdfb871b427027b3f6b82e1c3808447960b diff --git a/snd_sdl.c b/snd_sdl.c index 01f1bdcd..e93d3021 100644 --- a/snd_sdl.c +++ b/snd_sdl.c @@ -16,15 +16,17 @@ 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 "darkplaces.h" +#include "vid.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 @@ -39,33 +41,57 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int 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); + // 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; - PartialLength2 = FrameCount * factor - PartialLength1; - memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2); - } - else - memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor); + PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor; + memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1); - snd_renderbuffer->startframe += FrameCount; + PartialLength2 = FrameCount * factor - PartialLength1; + memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2); - if (FrameCount < RequestedFrames && developer.integer >= 200) - Con_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount); + // As of SDL 2.0 buffer needs to be fully initialized, so fill leftover part with silence + // FIXME this is another place that assumes 8bit is always unsigned and others always signed + memset(&stream[PartialLength1 + PartialLength2], snd_renderbuffer->format.width == 1 ? 0x80 : 0, len - (PartialLength1 + PartialLength2)); + } + else + { + memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor); - sdlaudiotime += RequestedFrames; + // As of SDL 2.0 buffer needs to be fully initialized, so fill leftover part with silence + // FIXME this is another place that assumes 8bit is always unsigned and others always signed + memset(&stream[FrameCount * factor], snd_renderbuffer->format.width == 1 ? 0x80 : 0, len - (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; + + SndSys_UnlockRenderBuffer(); + } } @@ -77,13 +103,15 @@ Create "snd_renderbuffer" with the proper sound format if the call is successful May return a suggested format if the requested format isn't available ==================== */ -qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested) +qbool SndSys_Init (snd_format_t* fmt) { unsigned int buffersize; 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,70 +119,48 @@ 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)fmt->speed / 25.0); // 2048 bytes on 24kHz to 48kHz // Init the SDL Audio subsystem + memset(&wantspec, 0, sizeof(wantspec)); wantspec.callback = Buffer_Callback; wantspec.userdata = NULL; - wantspec.freq = requested->speed; - wantspec.format = ((requested->width == 1) ? AUDIO_U8 : AUDIO_S16SYS); - wantspec.channels = requested->channels; + wantspec.freq = fmt->speed; + wantspec.format = fmt->width == 1 ? AUDIO_U8 : (fmt->width == 2 ? AUDIO_S16SYS : AUDIO_F32); + wantspec.channels = fmt->channels; wantspec.samples = CeilPowerOf2(buffersize); // needs to be a power of 2 on some platforms. - Con_DPrintf("Wanted audio Specification:\n" - "\tChannels : %i\n" - "\tFormat : 0x%X\n" - "\tFrequency : %i\n" - "\tSamples : %i\n", + Con_Printf("Wanted audio Specification:\n" + " Channels : %i\n" + " Format : 0x%X\n" + " Frequency : %i\n" + " Samples : %i\n", wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples); - if( SDL_OpenAudio( &wantspec, &obtainspec ) ) + if ((audio_device = SDL_OpenAudioDevice(NULL, 0, &wantspec, &obtainspec, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE | SDL_AUDIO_ALLOW_CHANNELS_CHANGE)) == 0) { - Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() ); + Con_Printf(CON_ERROR "Failed to open the audio device! (%s)\n", SDL_GetError() ); return false; } - Con_DPrintf("Obtained audio specification:\n" - "\tChannels : %i\n" - "\tFormat : 0x%X\n" - "\tFrequency : %i\n" - "\tSamples : %i\n", + Con_Printf("Obtained audio specification:\n" + " Channels : %i\n" + " Format : 0x%X\n" + " Frequency : %i\n" + " Samples : %i\n", obtainspec.channels, obtainspec.format, obtainspec.freq, obtainspec.samples); - // If we haven't obtained what we wanted - if (wantspec.freq != obtainspec.freq || - wantspec.format != obtainspec.format || - wantspec.channels != obtainspec.channels) - { - SDL_CloseAudio(); + fmt->speed = obtainspec.freq; + fmt->channels = obtainspec.channels; - // Pass the obtained format as a suggested format - if (suggested != NULL) - { - suggested->speed = obtainspec.freq; - // FIXME: check the format more carefully. There are plenty of unsupported cases - suggested->width = ((obtainspec.format == AUDIO_U8) ? 1 : 2); - suggested->channels = obtainspec.channels; - } - - return false; - } + snd_threaded = true; - snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL); + snd_renderbuffer = Snd_CreateRingBuffer(fmt, 0, NULL); if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO) - { - int newlayout; - -#ifdef __linux__ - newlayout = SND_CHANNELLAYOUT_ALSA; -#else - newlayout = SND_CHANNELLAYOUT_STANDARD; -#endif - Cvar_SetValueQuick (&snd_channellayout, newlayout); - } + Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD); sdlaudiotime = 0; - SDL_PauseAudio( false ); + SDL_PauseAudioDevice(audio_device, 0); return true; } @@ -169,8 +175,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); @@ -213,9 +221,9 @@ SndSys_LockRenderBuffer Get the exclusive lock on "snd_renderbuffer" ==================== */ -qboolean SndSys_LockRenderBuffer (void) +qbool SndSys_LockRenderBuffer (void) { - SDL_LockAudio(); + SDL_LockAudioDevice(audio_device); return true; } @@ -229,5 +237,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 }