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

Better (i.e. working) sound in the SDL sim in Windows.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8793 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dan Everton 2006-02-22 22:45:10 +00:00
parent a234ed8ce2
commit 4f54dbd91f
1 changed files with 44 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

75
uisimulator/sdl/sound.c
View file

@ -31,7 +31,7 @@ static bool pcm_playing;
static bool pcm_paused; static bool pcm_paused;
static Uint8* pcm_data; static Uint8* pcm_data;
static int pcm_data_size; static Uint32 pcm_data_size;
extern bool debug_audio; extern bool debug_audio;
@ -95,7 +95,7 @@ void pcm_play_stop(void)
void pcm_play_pause(bool play) void pcm_play_pause(bool play)
{ {
int next_size; Uint32 next_size;
Uint8 *next_start; Uint8 *next_start;
if (!pcm_playing) { if (!pcm_playing) {
@ -128,7 +128,7 @@ void pcm_play_pause(bool play)
SDL_PauseAudio(1); SDL_PauseAudio(1);
} }
pcm_paused = !play; pcm_paused = !play;
} }
@ -142,47 +142,60 @@ bool pcm_is_playing(void)
return pcm_playing; return pcm_playing;
} }
char overflow[8192]; Uint8 overflow[8192];
int overflow_amount = 0; Uint32 overflow_amount = 0;
void sdl_audio_callback(void *udata, Uint8 *stream, int len) void sdl_audio_callback(void *udata, Uint8 *stream, int len)
{ {
int datalen, offset; Uint32 pcm_data_played, need_to_play;
FILE *debug = (FILE *)udata; FILE *debug = (FILE *)udata;
/* At all times we need to write a full 'len' bytes to stream. */ /* At all times we need to write a full 'len' bytes to stream. */
if (pcm_data_size <= len) { if (pcm_data_size > 0) {
/* Play what we have */ /* We have some PCM data to play. Play as much as we can. */
memcpy(stream, pcm_data, pcm_data_size);
pcm_data_played = (((Uint32)len) > pcm_data_size) ? pcm_data_size : len;
memcpy(stream, pcm_data, pcm_data_played);
if (debug != NULL) { if (debug != NULL) {
fwrite(pcm_data, sizeof(Uint8), pcm_data_size, debug); fwrite(pcm_data, sizeof(Uint8), pcm_data_played, debug);
} }
offset = pcm_data_size;
datalen = len - pcm_data_size;
/* Get some more */
callback_for_more(&pcm_data, &pcm_data_size);
/* Play enough of that to keep the audio buffer full */ stream += pcm_data_played;
memcpy(stream + offset, pcm_data, datalen); need_to_play = len - pcm_data_played;
pcm_data += pcm_data_played;
if (debug != NULL) { pcm_data_size -= pcm_data_played;
fwrite(pcm_data, sizeof(Uint8), datalen, debug);
while(need_to_play > 0) {
/* Loop until we have written enough */
callback_for_more(&pcm_data, &pcm_data_size);
if (pcm_data_size > 0) {
/* We got more data */
pcm_data_played = (need_to_play > pcm_data_size) ? pcm_data_size : need_to_play;
memcpy(stream, pcm_data, pcm_data_played);
if (debug != NULL) {
fwrite(pcm_data, sizeof(Uint8), pcm_data_played, debug);
}
stream += pcm_data_played;
need_to_play -= pcm_data_played;
pcm_data += pcm_data_played;
pcm_data_size -= pcm_data_played;
}
} }
} else { } else {
datalen = len; pcm_data_size = 0;
memcpy(stream, pcm_data, len); pcm_data = NULL;
if (debug != NULL) {
fwrite(pcm_data, sizeof(Uint8), len, debug);
}
}
pcm_data_size -= datalen; /* No data, try and get some */
pcm_data += datalen; callback_for_more(&pcm_data, &pcm_data_size);
}
} }
int pcm_init(void) int pcm_init(void)
@ -198,7 +211,7 @@ int pcm_init(void)
fmt.freq = 44100; fmt.freq = 44100;
fmt.format = AUDIO_S16SYS; fmt.format = AUDIO_S16SYS;
fmt.channels = 2; fmt.channels = 2;
fmt.samples = 512; fmt.samples = 2048;
fmt.callback = sdl_audio_callback; fmt.callback = sdl_audio_callback;
fmt.userdata = debug; fmt.userdata = debug;