summaryrefslogtreecommitdiff
path: root/src/i_sdlsound.c
diff options
context:
space:
mode:
authorSimon Howard2009-09-30 23:07:03 +0000
committerSimon Howard2009-09-30 23:07:03 +0000
commit410579ec66f7df8757cb980c0a78e3161b7f20d5 (patch)
treede78df18ecc96327446f554991fad708a84b7ecb /src/i_sdlsound.c
parent42f7a9b8a27ae1192b49005f5be3eba32f740d05 (diff)
downloadchocolate-doom-410579ec66f7df8757cb980c0a78e3161b7f20d5.tar.gz
chocolate-doom-410579ec66f7df8757cb980c0a78e3161b7f20d5.tar.bz2
chocolate-doom-410579ec66f7df8757cb980c0a78e3161b7f20d5.zip
Change British English spellings to American English, for consistency.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1699
Diffstat (limited to 'src/i_sdlsound.c')
-rw-r--r--src/i_sdlsound.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/i_sdlsound.c b/src/i_sdlsound.c
index ea5c92a5..d51345c7 100644
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -52,7 +52,7 @@
#define MAX_SOUND_SLICE_TIME 70 /* ms */
#define NUM_CHANNELS 16
-static boolean sound_initialised = false;
+static boolean sound_initialized = false;
static Mix_Chunk sound_chunks[NUMSFX];
static int channels_playing[NUM_CHANNELS];
@@ -180,7 +180,7 @@ static void ExpandSoundData_SDL(byte *data,
destination->abuf
= Z_Malloc(expanded_length, PU_STATIC, &destination->abuf);
- // If we can, use the standard / optimised SDL conversion routines.
+ // If we can, use the standard / optimized SDL conversion routines.
if (samplerate <= mixer_freq
&& ConvertibleRatio(samplerate, mixer_freq)
@@ -548,7 +548,7 @@ static void I_SDL_UpdateSoundParams(int handle, int vol, int sep)
{
int left, right;
- if (!sound_initialised)
+ if (!sound_initialized)
{
return;
}
@@ -577,7 +577,7 @@ static int I_SDL_StartSound(int id, int channel, int vol, int sep)
{
Mix_Chunk *chunk;
- if (!sound_initialised)
+ if (!sound_initialized)
{
return -1;
}
@@ -611,7 +611,7 @@ static int I_SDL_StartSound(int id, int channel, int vol, int sep)
static void I_SDL_StopSound (int handle)
{
- if (!sound_initialised)
+ if (!sound_initialized)
{
return;
}
@@ -659,7 +659,7 @@ static void I_SDL_UpdateSound(void)
static void I_SDL_ShutdownSound(void)
{
- if (!sound_initialised)
+ if (!sound_initialized)
{
return;
}
@@ -667,7 +667,7 @@ static void I_SDL_ShutdownSound(void)
Mix_CloseAudio();
SDL_QuitSubSystem(SDL_INIT_AUDIO);
- sound_initialised = false;
+ sound_initialized = false;
}
// Calculate slice size, based on MAX_SOUND_SLICE_TIME.
@@ -721,7 +721,7 @@ static boolean I_SDL_InitSound(void)
if (Mix_OpenAudio(snd_samplerate, AUDIO_S16SYS, 2, GetSliceSize()) < 0)
{
- fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
+ fprintf(stderr, "Error initializing SDL_mixer: %s\n", Mix_GetError());
return false;
}
@@ -751,7 +751,7 @@ static boolean I_SDL_InitSound(void)
SDL_PauseAudio(0);
- sound_initialised = true;
+ sound_initialized = true;
return true;
}