Merge from trunk.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1702

2 files changed, 10 insertions, 10 deletions

diff --git a/pcsound/pcsound.c b/pcsound/pcsound.c
index 4695e6e1..529349ef 100644
--- a/pcsound/pcsound.c
+++ b/pcsound/pcsound.c
@@ -109,7 +109,7 @@ int PCSound_Init(pcsound_callback_func callback_func)
                 }
                 else
                 {
-                    printf("Failed to initialise PC sound driver: %s\n",
+                    printf("Failed to initialize PC sound driver: %s\n",
                            drivers[i]->name);
                     break;
                 }
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.