mirror of
https://github.com/Oibaf66/fbzx-wii.git
synced 2024-11-24 09:09:20 +01:00
SDL sound instead of ASND sound with WII version
This commit is contained in:
parent
a3f23127a3
commit
a47a22445f
@ -1222,7 +1222,7 @@ int main(int argc,char *argv[])
|
|||||||
#ifdef GEKKO
|
#ifdef GEKKO
|
||||||
dblbuffer=1;
|
dblbuffer=1;
|
||||||
hwsurface=1;
|
hwsurface=1;
|
||||||
sound_type=SOUND_ASND;
|
//sound_type=SOUND_ASND; //play_click does not work with ASND double buffer
|
||||||
setenv("HOME", "/fbzx-wii", 1);
|
setenv("HOME", "/fbzx-wii", 1);
|
||||||
|
|
||||||
//initialize libfat library
|
//initialize libfat library
|
||||||
|
17
src/sound.c
17
src/sound.c
@ -227,14 +227,14 @@ int sound_init_sdl() {
|
|||||||
SDL_AudioSpec fmt;
|
SDL_AudioSpec fmt;
|
||||||
|
|
||||||
ordenador.sign=0;
|
ordenador.sign=0;
|
||||||
ordenador.format=1; //16 bit
|
ordenador.format=1; //16 bit LE
|
||||||
ordenador.channels=2; //stereo
|
ordenador.channels=2; //stereo
|
||||||
ordenador.freq=48000;
|
ordenador.freq=48000;
|
||||||
ordenador.buffer_len=4096;
|
ordenador.buffer_len=4096;
|
||||||
|
|
||||||
/* Set 16-bit stereo audio at 48Khz */
|
/* Set 16-bit stereo audio at 48Khz */
|
||||||
fmt.freq = ordenador.freq;
|
fmt.freq = ordenador.freq;
|
||||||
fmt.format = AUDIO_U16LSB; //unsigned Little endian
|
fmt.format = AUDIO_S16SYS; //signed Little endian/Big endian
|
||||||
fmt.channels = ordenador.channels;
|
fmt.channels = ordenador.channels;
|
||||||
fmt.samples = ordenador.buffer_len; //number of samples
|
fmt.samples = ordenador.buffer_len; //number of samples
|
||||||
fmt.callback = sdlcallback;
|
fmt.callback = sdlcallback;
|
||||||
@ -244,6 +244,17 @@ int sound_init_sdl() {
|
|||||||
|
|
||||||
/* Open the audio device and start playing sound! */
|
/* Open the audio device and start playing sound! */
|
||||||
if (SDL_OpenAudio(&fmt, NULL) < 0 ) return -1;
|
if (SDL_OpenAudio(&fmt, NULL) < 0 ) return -1;
|
||||||
|
|
||||||
|
printf("SDL audio initiated\n");
|
||||||
|
|
||||||
|
ordenador.freq = fmt.freq;
|
||||||
|
ordenador.channels = fmt.channels;
|
||||||
|
ordenador.buffer_len = fmt.samples; //number of samples
|
||||||
|
|
||||||
|
printf("freq = %d\n",fmt.freq);
|
||||||
|
printf("channels = %d\n",fmt.channels);
|
||||||
|
printf("buffer_len = %d\n",fmt.samples);
|
||||||
|
printf("format = %x\n",fmt.format);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -258,7 +269,7 @@ int sound_init_asnd() {
|
|||||||
ASND_Init();
|
ASND_Init();
|
||||||
ASND_Pause(0);
|
ASND_Pause(0);
|
||||||
ordenador.sign=0;
|
ordenador.sign=0;
|
||||||
ordenador.format=1; //16 bit
|
ordenador.format=2; //16 bit BE
|
||||||
ordenador.channels=2; //stereo
|
ordenador.channels=2; //stereo
|
||||||
ordenador.freq=48000;
|
ordenador.freq=48000;
|
||||||
ordenador.buffer_len=4096;
|
ordenador.buffer_len=4096;
|
||||||
|
Loading…
Reference in New Issue
Block a user