From 44daf03024fbf7cbffa10349044786f6ab784821 Mon Sep 17 00:00:00 2001 From: "Tomas Chvatal (scarabeus)" Date: Wed, 22 Oct 2008 22:51:24 +0200 Subject: Revert "X" This reverts commit e12753d2ec9db83ec08bb9db63902a82fb245cdd. --- src/audio/audio.c | 53 ++++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) (limited to 'src/audio/audio.c') diff --git a/src/audio/audio.c b/src/audio/audio.c index 6f8bfba..cc9d81e 100644 --- a/src/audio/audio.c +++ b/src/audio/audio.c @@ -11,49 +11,44 @@ static bool_t isAudioInit = FALSE; /* * Returns state of audio */ -bool_t -isAudioInicialized() +bool_t isAudioInicialized() { - return isAudioInit; + return isAudioInit; } - /* * Inicialize audio */ -void -initAudio() +void initAudio() { - if (isParamFlag("--noaudio")) { - return; - } + if( isParamFlag("--noaudio") ) + { + return; + } - if (SDL_Init(SDL_INIT_AUDIO) == -1) { - fprintf(stderr, _("Unable to initialize audio: %s\n"), SDL_GetError()); - return; - } - if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024) == - -1) { - fprintf(stderr, _("Unable to create proper audio settings: %s\n"), - Mix_GetError()); - return; - } - Mix_AllocateChannels(16); - Mix_Volume(-1, MIX_MAX_VOLUME); + if (SDL_Init(SDL_INIT_AUDIO) == -1) { + fprintf(stderr, _("Unable to initialize audio: %s\n"), SDL_GetError()); + return; + } + if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 1024) == -1) { + fprintf(stderr, _("Unable to create proper audio settings: %s\n"), Mix_GetError()); + return; + } + Mix_AllocateChannels(16); + Mix_Volume(-1, MIX_MAX_VOLUME); #ifdef DEBUG - printf(_("Initializing audio system...\n")); + printf(_("Initializing audio system...\n")); #endif - isAudioInit = TRUE; + isAudioInit = TRUE; } - /* * Quit audio */ -void -quitAudio() +void quitAudio() { - Mix_CloseAudio(); - isAudioInit = TRUE; + Mix_CloseAudio(); + isAudioInit = TRUE; #ifdef DEBUG - printf(_("Quitting audio...\n")); + printf(_("Quitting audio...\n")); #endif } + -- cgit v1.2.3