a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some sound code rollback, fixes problems when using ALSA.

Browse Source
This commit is contained in:
n-a-c-h
2004-12-24 02:04:04 +00:00
parent 6026849fd0
commit 1c9a23dbd0
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zsnes/src/linux/sdllink.c
View File

@@ -531,7 +531,7 @@ void ProcessKeyBuf(int scancode)
int InitSound(void) int InitSound(void)
{ {
SDL_AudioSpec wanted; SDL_AudioSpec wanted;
const int samptab[7] = { 1, 1, 2, 4, 2, 4, 4 };
const int freqtab[7] = { 8000, 11025, 22050, 44100, 16000, 32000, 48000 }; const int freqtab[7] = { 8000, 11025, 22050, 44100, 16000, 32000, 48000 };
SDL_CloseAudio(); SDL_CloseAudio();
@@ -562,16 +562,8 @@ int InitSound(void)
wanted.channels = 1; wanted.channels = 1;
} }
wanted.samples = (freqtab[SoundQuality] * wanted.channels)/32; wanted.samples = samptab[SoundQuality] * 128 * wanted.channels;
printf("InitSound: %dhz, requesting %d sized buffer, " , freqtab[SoundQuality], wanted.samples);
if (wanted.samples < 256) { wanted.samples = 256; }
else if(wanted.samples < 512) { wanted.samples = 512; }
else if(wanted.samples < 1024) { wanted.samples = 1024; }
else { wanted.samples = 2048; } // never exceed this.
printf("getting %d.\n",wanted.samples);
wanted.format = AUDIO_S16LSB; wanted.format = AUDIO_S16LSB;
wanted.userdata = NULL; wanted.userdata = NULL;
wanted.callback = UpdateSound; wanted.callback = UpdateSound;
@@ -586,9 +578,9 @@ int InitSound(void)
} }
SDL_PauseAudio(0); SDL_PauseAudio(0);
Buffer_len = (audiospec.size * 3); Buffer_len = (audiospec.size * 2);
Buffer_len = (Buffer_len + 255) & ~255; /* Align to SPCSize */; Buffer_len = (Buffer_len + 255) & ~255; /* Align to SPCSize */
Buffer = malloc(Buffer_len+1); Buffer = malloc(Buffer_len);
return TRUE; return TRUE;
} }