diff options
author | James Haley | 2010-01-26 00:59:02 +0000 |
---|---|---|
committer | James Haley | 2010-01-26 00:59:02 +0000 |
commit | b80409202d07732ec201c9816887262b505b81d4 (patch) | |
tree | 364dcb86f2c22411a720447bfa21c4de9191ff6f /pcsound/pcsound_sdl.c | |
parent | 66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1 (diff) | |
parent | 8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae (diff) | |
download | chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.gz chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.bz2 chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.zip |
Merge from raven-branch
Subversion-branch: /branches/strife-branch
Subversion-revision: 1825
Diffstat (limited to 'pcsound/pcsound_sdl.c')
-rw-r--r-- | pcsound/pcsound_sdl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pcsound/pcsound_sdl.c b/pcsound/pcsound_sdl.c index 6ba06785..d62b57e6 100644 --- a/pcsound/pcsound_sdl.c +++ b/pcsound/pcsound_sdl.c @@ -35,10 +35,10 @@ #define MAX_SOUND_SLICE_TIME 70 /* ms */ #define SQUARE_WAVE_AMP 0x2000 -// If true, we initialised SDL and have the responsibility to shut it +// If true, we initialized SDL and have the responsibility to shut it // down -static int sdl_was_initialised = 0; +static int sdl_was_initialized = 0; // Callback function to invoke when we want new sound data @@ -146,7 +146,7 @@ static void PCSound_Mix_Callback(void *udata, Uint8 *stream, int len) } } -static int SDLIsInitialised(void) +static int SDLIsInitialized(void) { int freq, channels; Uint16 format; @@ -156,11 +156,11 @@ static int SDLIsInitialised(void) static void PCSound_SDL_Shutdown(void) { - if (sdl_was_initialised) + if (sdl_was_initialized) { Mix_CloseAudio(); SDL_QuitSubSystem(SDL_INIT_AUDIO); - sdl_was_initialised = 0; + sdl_was_initialized = 0; } } @@ -196,9 +196,9 @@ static int PCSound_SDL_Init(pcsound_callback_func callback_func) int slicesize; // Check if SDL_mixer has been opened already - // If not, we must initialise it now + // If not, we must initialize it now - if (!SDLIsInitialised()) + if (!SDLIsInitialized()) { if (SDL_Init(SDL_INIT_AUDIO) < 0) { @@ -210,7 +210,7 @@ static int PCSound_SDL_Init(pcsound_callback_func callback_func) if (Mix_OpenAudio(pcsound_sample_rate, AUDIO_S16SYS, 2, slicesize) < 0) { - fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError()); + fprintf(stderr, "Error initializing SDL_mixer: %s\n", Mix_GetError()); SDL_QuitSubSystem(SDL_INIT_AUDIO); return 0; @@ -221,7 +221,7 @@ static int PCSound_SDL_Init(pcsound_callback_func callback_func) // When this module shuts down, it has the responsibility to // shut down SDL. - sdl_was_initialised = 1; + sdl_was_initialized = 1; } // Get the mixer frequency, format and number of channels. |