X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sound.c;h=981040794fb0d23a35c623e413ca98668a1422a3;hb=bbba320911a86c0ee373f8297f80a2b82de22039;hp=01d61e20e9e1fd136b2c3a2070ce8180e20f3526;hpb=eb3668fc5dab138073cd4844208ac05b94086a4a;p=gpsp.git diff --git a/sound.c b/sound.c index 01d61e2..9810407 100644 --- a/sound.c +++ b/sound.c @@ -27,9 +27,8 @@ gbc_sound_struct gbc_sound_channel[4]; u32 sound_frequency = 44100; -SDL_AudioSpec sound_settings; SDL_mutex *sound_mutex; -SDL_cond *sound_cv; +static SDL_cond *sound_cv; #ifdef PSP_BUILD u32 audio_buffer_size_number = 1; @@ -37,15 +36,15 @@ u32 audio_buffer_size_number = 1; u32 audio_buffer_size_number = 8; #endif -u32 audio_buffer_size; -u32 sound_on = 0; -s16 sound_buffer[BUFFER_SIZE]; -u32 sound_buffer_base = 0; +u32 sound_on; +static u32 audio_buffer_size; +static s16 sound_buffer[BUFFER_SIZE]; +static u32 sound_buffer_base; -u32 sound_last_cpu_ticks = 0; -fixed16_16 gbc_sound_tick_step; +static u32 sound_last_cpu_ticks; +static fixed16_16 gbc_sound_tick_step; -u32 sound_exit_flag; +static u32 sound_exit_flag; // Queue 1, 2, or 4 samples to the top of the DS FIFO, wrap around circularly @@ -751,6 +750,8 @@ void sound_exit() void init_sound() { + SDL_AudioSpec sound_settings; + #ifdef PSP_BUILD audio_buffer_size = (audio_buffer_size_number * 1024) + 3072; #else