X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=432787c2bdf4a5c04123e97b379846709775ef97;hb=6d37ddaaf9915af0f483f4fc04d07b98e99e091e;hp=916d92f10f4b19f424de7d3f4c229dc9063701da;hpb=ae0910c3223faf69f7638780ff8e49cf08bbb554;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 916d92f1..432787c2 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -742,13 +742,14 @@ inline void OpenAudio(void) audio.sound_enabled = FALSE; audio.sound_deactivated = FALSE; - audio.soundserver_pipe[0] = audio.soundserver_pipe[1] = 0; - audio.soundserver_pid = -1; + audio.mixer_pipe[0] = audio.mixer_pipe[1] = 0; + audio.mixer_pid = -1; audio.device_name = NULL; - audio.device_fd = 0; + audio.device_fd = -1; - audio.channels = 0; + audio.num_channels = 0; audio.music_channel = 0; + audio.first_sound_channel = 0; #if defined(TARGET_SDL) SDLOpenAudio(); @@ -780,13 +781,6 @@ inline void SetAudioMode(boolean enabled) audio.sound_enabled = enabled; } -inline void SetAudioReloadFunctions(void (*func_reload_sounds)(void), - void (*func_reload_music)(void)) -{ - audio.func_reload_sounds = func_reload_sounds; - audio.func_reload_music = func_reload_music; -} - /* ========================================================================= */ /* event functions */