devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

quake: migrate to SDL_mixer and add background music

Browse source 
Kind of skippy and only supports WAV. MP3 would be nice, especially if
using Rockbox's codec.

Change-Id: I0bba195603da32da1e4d1dcf2ee821fa5696824a
This commit is contained in:
Franklin Wei 2019-08-04 14:58:37 -04:00 • committed by Solomon Peachy
parent f5d31fc1c4
commit 54b3b6f797
4 changed files with 150 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

56
apps/plugins/sdl/progs/quake/snd_sdl.c
View file

@ -2,6 +2,7 @@
#include <stdio.h>
#include "SDL_audio.h"
#include "SDL_byteorder.h"
#include "SDL_mixer.h"
#include "quakedef.h"
static dma_t the_shm;
@ -11,7 +12,7 @@ extern int desired_speed;
extern int desired_bits;
// SDL hereby demands `len' samples in stream, *NOW*!
static void paint_audio(void *unused, Uint8 *stream, int len)
static void paint_audio(int chan, Uint8 *stream, int len, void *unused)
{
if ( shm ) {
shm->buffer = stream;
@ -46,49 +47,40 @@ qboolean SNDDMA_Init(void)
}
desired.channels = 2;
desired.samples = 1024;
desired.callback = paint_audio;
//desired.callback = paint_audio;
if( Mix_OpenAudio(desired_speed, desired.format, desired.channels, desired.samples) < 0 )
{
Con_Printf("Couldn't open SDL audio: %s\n", Mix_GetError());
return 0;
}
Mix_RegisterEffect(0, paint_audio, NULL, NULL);
#if 0
/* Open the audio device */
if ( SDL_OpenAudio(&desired, &obtained) < 0 ) {
Con_Printf("Couldn't open SDL audio: %s\n", SDL_GetError());
return 0;
}
#endif
void *blank_buf = (Uint8 *)malloc(4096);
memset(blank_buf, 0, 4096);
Mix_Chunk *blank = Mix_QuickLoad_RAW(blank_buf, 4096);
Mix_PlayChannel(0, blank, -1);
/* Make sure we can support the audio format */
switch (obtained.format) {
case AUDIO_U8:
/* Supported */
break;
case AUDIO_S16LSB:
case AUDIO_S16MSB:
if ( ((obtained.format == AUDIO_S16LSB) &&
(SDL_BYTEORDER == SDL_LIL_ENDIAN)) ||
((obtained.format == AUDIO_S16MSB) &&
(SDL_BYTEORDER == SDL_BIG_ENDIAN)) ) {
/* Supported */
break;
}
/* Unsupported, fall through */;
default:
/* Not supported -- force SDL to do our bidding */
SDL_CloseAudio();
if ( SDL_OpenAudio(&desired, NULL) < 0 ) {
Con_Printf("Couldn't open SDL audio: %s\n",
SDL_GetError());
return 0;
}
memcpy(&obtained, &desired, sizeof(desired));
break;
}
SDL_PauseAudio(0);
/* Fill the audio DMA information block */
shm = &the_shm;
shm->splitbuffer = 0;
shm->samplebits = (obtained.format & 0xFF);
shm->speed = obtained.freq;
shm->channels = obtained.channels;
shm->samples = obtained.samples*shm->channels;
shm->samplebits = (desired.format & 0xFF);
shm->speed = desired.freq;
shm->channels = desired.channels;
shm->samples = desired.samples*shm->channels;
shm->samplepos = 0;
shm->submission_chunk = 1;
shm->buffer = NULL;