From b0f33eb6ed0f76d80bd9500224ff9b25378582f9 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 29 Jan 2015 23:17:02 -0800
Subject: [PATCH] rename var

---
 arch/dos/digi.c       | 24 ++++++++++++------------
 arch/dos/digiallg.c   | 12 ++++++------
 arch/dos/digimm.c     | 26 +++++++++++++-------------
 arch/linux/alsadigi.c | 24 ++++++++++++------------
 arch/sdl/digi.c       | 28 ++++++++++++++--------------
 arch/win32/digi.c     | 34 +++++++++++++++++-----------------
 arch/win32/midi.c     |  6 +++---
 7 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/arch/dos/digi.c b/arch/dos/digi.c
index 7a0d932b..a4af489a 100644
--- a/arch/dos/digi.c
+++ b/arch/dos/digi.c
@@ -111,7 +111,7 @@ static const unsigned char mix8[] =
 int digi_volume = SOUND_MAX_VOLUME;
 //end edit by adb
 
-static int digi_initialised = 0;
+static int Digi_initialized = 0;
 
 struct sound_slot {
  int soundno;
@@ -199,8 +199,8 @@ void digi_reset() { }
 /* Shut down audio */
 void digi_close()
 {
- if (!digi_initialised) return;
- digi_initialised = 0;
+ if (!Digi_initialized) return;
+ Digi_initialized = 0;
 }
 
 void digi_stop_all_channels()
@@ -222,7 +222,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 {
 	int i, starting_channel;
 
-	if (!digi_initialised) return -1;
+	if (!Digi_initialized) return -1;
 
 	if (soundnum < 0) return -1;
 
@@ -288,7 +288,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 // -1 if none.
 int digi_find_channel(int soundno)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return -1;
 
 	if (soundno < 0 )
@@ -316,7 +316,7 @@ void digi_set_digi_volume( int dvolume )
 	else
 		digi_volume = dvolume;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_sync_sounds();
 }
@@ -348,7 +348,7 @@ void digi_set_max_channels(int n) {
 	if (digi_max_channels > MAX_SOUND_SLOTS)
 		digi_max_channels = MAX_SOUND_SLOTS;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_stop_all_channels();
 }
@@ -360,7 +360,7 @@ int digi_get_max_channels() {
 
 int digi_is_channel_playing(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return 0;
 
 	return SoundSlots[channel].playing;
@@ -368,7 +368,7 @@ int digi_is_channel_playing(int channel)
 
 void digi_set_channel_volume(int channel, int volume)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -379,7 +379,7 @@ void digi_set_channel_volume(int channel, int volume)
 
 void digi_set_channel_pan(int channel, int pan)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -397,7 +397,7 @@ void digi_stop_sound(int channel)
 
 void digi_end_sound(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -443,7 +443,7 @@ void digi_debug()
 	int i;
 	int n_voices = 0;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	for (i = 0; i < digi_max_channels; i++)
diff --git a/arch/dos/digiallg.c b/arch/dos/digiallg.c
index 997e4f17..a93e277b 100644
--- a/arch/dos/digiallg.c
+++ b/arch/dos/digiallg.c
@@ -326,7 +326,7 @@ CHANNEL digi_start_sound(int soundnum, int volume, int pan) {
 // -1 if none.
 int digi_find_channel(int soundno)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return -1;
 
 	if (soundno < 0 )
@@ -402,7 +402,7 @@ int digi_is_channel_playing(int channel)
 {
 	int i;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return 0;
 
 	//FIXME: not implemented
@@ -411,7 +411,7 @@ int digi_is_channel_playing(int channel)
 
 void digi_set_channel_volume(int channel, int volume)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	//FIXME: not implemented
@@ -419,7 +419,7 @@ void digi_set_channel_volume(int channel, int volume)
 
 void digi_set_channel_pan(int channel, int pan)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	//FIXME: not implemented
@@ -432,7 +432,7 @@ void digi_stop_sound(int channel)
 
 void digi_end_sound(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	//FIXME: not implemented
@@ -496,7 +496,7 @@ void digi_debug()
 	int i;
 	int n_voices = 0;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	for (i = 0; i < digi_max_channels; i++)
diff --git a/arch/dos/digimm.c b/arch/dos/digimm.c
index 6d083817..60bd0d01 100644
--- a/arch/dos/digimm.c
+++ b/arch/dos/digimm.c
@@ -122,7 +122,7 @@ static const unsigned char mix8[] =
 int digi_volume = SOUND_MAX_VOLUME;
 //end edit by adb
 
-static int digi_initialised = 0;
+static int Digi_initialized = 0;
 static int timer_system_initialized = 0;
 
 struct sound_slot {
@@ -268,7 +268,7 @@ int digi_init()
  #endif
 
  atexit(digi_close);
- digi_initialised = 1;
+ Digi_initialized = 1;
  return 0;
 }
 
@@ -278,8 +278,8 @@ void digi_reset() { }
 /* Shut down audio */
 void digi_close()
 {
- if (!digi_initialised) return;
- digi_initialised = 0;
+ if (!Digi_initialized) return;
+ Digi_initialized = 0;
  drv->PlayStop();
  drv->Exit();
  if (timer_system_initialized)
@@ -315,7 +315,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 {
 	int i, starting_channel;
 
-	if (!digi_initialised) return -1;
+	if (!Digi_initialized) return -1;
 
 	if (soundnum < 0) return -1;
 
@@ -380,7 +380,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 // -1 if none.
 int digi_find_channel(int soundno)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return -1;
 
 	if (soundno < 0 )
@@ -408,7 +408,7 @@ void digi_set_digi_volume( int dvolume )
 	else
 		digi_volume = dvolume;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_sync_sounds();
 }
@@ -445,7 +445,7 @@ void digi_set_max_channels(int n) {
 	if (digi_max_channels > MAX_SOUND_SLOTS)
 		digi_max_channels = MAX_SOUND_SLOTS;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_stop_all_channels();
 }
@@ -457,7 +457,7 @@ int digi_get_max_channels() {
 
 int digi_is_channel_playing(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return 0;
 
 	return SoundSlots[channel].playing;
@@ -465,7 +465,7 @@ int digi_is_channel_playing(int channel)
 
 void digi_set_channel_volume(int channel, int volume)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -476,7 +476,7 @@ void digi_set_channel_volume(int channel, int volume)
 
 void digi_set_channel_pan(int channel, int pan)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -494,7 +494,7 @@ void digi_stop_sound(int channel)
 
 void digi_end_sound(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -510,7 +510,7 @@ void digi_debug()
 	int i;
 	int n_voices = 0;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	for (i = 0; i < digi_max_channels; i++)
diff --git a/arch/linux/alsadigi.c b/arch/linux/alsadigi.c
index 7a2ffdfa..e81d9b65 100644
--- a/arch/linux/alsadigi.c
+++ b/arch/linux/alsadigi.c
@@ -103,7 +103,7 @@ static const ubyte mix8[] =
 int digi_volume = SOUND_MAX_VOLUME;
 //end edit by adb
 
-static int digi_initialised = 0;
+static int Digi_initialized = 0;
 
 struct sound_slot {
  int soundno;
@@ -305,7 +305,7 @@ int digi_init()
  pthread_attr_destroy(&attr);
 
  atexit(digi_close);
- digi_initialised = 1;
+ Digi_initialized = 1;
  return 0;
 }
 
@@ -315,9 +315,9 @@ void digi_reset() { }
 /* Shut down audio */
 void digi_close()
 {
- if (!digi_initialised) return;
+ if (!Digi_initialized) return;
  pthread_cancel(thread_id);
- digi_initialised = 0;
+ Digi_initialized = 0;
  pthread_mutex_destroy(&mutex);
  snd_pcm_close(snd_devhandle);
 }
@@ -341,7 +341,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 {
 	int i, starting_channel;
 
-	if (!digi_initialised) return -1;
+	if (!Digi_initialized) return -1;
 
 	if (soundnum < 0) return -1;
 
@@ -409,7 +409,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 // -1 if none.
 int digi_find_channel(int soundno)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return -1;
 
 	if (soundno < 0 )
@@ -437,7 +437,7 @@ void digi_set_digi_volume( int dvolume )
 	else
 		digi_volume = dvolume;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_sync_sounds();
 }
@@ -476,7 +476,7 @@ void digi_set_max_channels(int n) {
 	if (digi_max_channels > MAX_SOUND_SLOTS)
 		digi_max_channels = MAX_SOUND_SLOTS;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_stop_all_channels();
 }
@@ -488,7 +488,7 @@ int digi_get_max_channels() {
 
 int digi_is_channel_playing(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return 0;
 
 	LOCK();
@@ -503,7 +503,7 @@ int digi_is_channel_playing(int channel)
 
 void digi_set_channel_volume(int channel, int volume)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	LOCK();
@@ -514,7 +514,7 @@ void digi_set_channel_volume(int channel, int volume)
 
 void digi_set_channel_pan(int channel, int pan)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	LOCK();
@@ -534,7 +534,7 @@ void digi_stop_sound(int channel)
 
 void digi_end_sound(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	LOCK();
diff --git a/arch/sdl/digi.c b/arch/sdl/digi.c
index e7de9798..6da1e567 100644
--- a/arch/sdl/digi.c
+++ b/arch/sdl/digi.c
@@ -111,7 +111,7 @@ static const Uint8 mix8[] =
 int digi_volume = SOUND_MAX_VOLUME;
 //end edit by adb
 
-static int digi_initialised = 0;
+static int Digi_initialized = 0;
 
 struct sound_slot {
 	int soundno;
@@ -141,7 +141,7 @@ static void audio_mixcallback(void *userdata, Uint8 *stream, int len)
 	Uint8 *streamend = stream + len;
 	struct sound_slot *sl;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	memset(stream, 0x80, len); // fix "static" sound bug on Mac OS X
@@ -208,7 +208,7 @@ int digi_init()
 	SDL_PauseAudio(0);
 	
 	atexit(digi_close);
-	digi_initialised = 1;
+	Digi_initialized = 1;
 	return 0;
 }
 
@@ -218,8 +218,8 @@ void digi_reset() { }
 /* Shut down audio */
 void digi_close()
 {
-	if (!digi_initialised) return;
-	digi_initialised = 0;
+	if (!Digi_initialized) return;
+	Digi_initialized = 0;
 #ifdef __MINGW32__
 	SDL_Delay(500); // CloseAudio hangs if it's called too soon after opening?
 #endif
@@ -245,7 +245,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 {
 	int i, starting_channel;
 
-	if (!digi_initialised) return -1;
+	if (!Digi_initialized) return -1;
 
 	if (soundnum < 0) return -1;
 
@@ -310,7 +310,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
 // -1 if none.
 int digi_find_channel(int soundno)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return -1;
 
 	if (soundno < 0 )
@@ -338,7 +338,7 @@ void digi_set_digi_volume( int dvolume )
 	else
 		digi_volume = dvolume;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_sync_sounds();
 }
@@ -375,7 +375,7 @@ void digi_set_max_channels(int n) {
 	if (digi_max_channels > MAX_SOUND_SLOTS) 
 		digi_max_channels = MAX_SOUND_SLOTS;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_stop_all_channels();
 }
@@ -387,7 +387,7 @@ int digi_get_max_channels() {
 
 int digi_is_channel_playing(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return 0;
 
 	return SoundSlots[channel].playing;
@@ -395,7 +395,7 @@ int digi_is_channel_playing(int channel)
 
 void digi_set_channel_volume(int channel, int volume)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -406,7 +406,7 @@ void digi_set_channel_volume(int channel, int volume)
 
 void digi_set_channel_pan(int channel, int pan)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -424,7 +424,7 @@ void digi_stop_sound(int channel)
 
 void digi_end_sound(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -458,7 +458,7 @@ void digi_debug()
 	int i;
 	int n_voices = 0;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	for (i = 0; i < digi_max_channels; i++)
diff --git a/arch/win32/digi.c b/arch/win32/digi.c
index bc5eff0f..64c089bf 100644
--- a/arch/win32/digi.c
+++ b/arch/win32/digi.c
@@ -59,7 +59,7 @@ int digi_midi_song_playing = 0;
 int digi_last_midi_song = 0;
 int digi_last_midi_song_loop = 0;
 
-static int digi_initialised = 0;
+static int Digi_initialized = 0;
 static int digi_atexit_initialised=0;
 
 //added on 980905 by adb to add rotating/volume based sound kill system
@@ -75,12 +75,12 @@ void digi_reset() { }
 
 void digi_close(void)
 {
-	if(digi_initialised)
+	if(Digi_initialized)
 	{
 		digi_reset_digi_sounds();
 		IDirectSound_Release(lpds);
 	}
-	digi_initialised = 0;
+	Digi_initialized = 0;
 }
 
 /* Initialise audio devices. */
@@ -88,7 +88,7 @@ int digi_init()
 {
  HRESULT hr;
  
- if (!digi_initialised && g_hWnd){
+ if (!Digi_initialized && g_hWnd){
 
 	 memset(&waveformat, 0, sizeof(waveformat));
 	 waveformat.wFormatTag=WAVE_FORMAT_PCM;
@@ -115,7 +115,7 @@ int digi_init()
 	 dsbd.dwReserved=0;
 	 dsbd.lpwfxFormat = &waveformat;
 
-	 digi_initialised = 1;
+	 Digi_initialized = 1;
 }
 
 	if (!digi_atexit_initialised){
@@ -187,7 +187,7 @@ int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_
  int slot;
  HRESULT hr;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return -1;
 
 	// added on 980905 by adb from original source to add sound kill system
@@ -275,7 +275,7 @@ TryNextChannel:
 // -1 if none.
 int digi_find_channel(int soundno)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return -1;
 
 	if (soundno < 0 )
@@ -313,7 +313,7 @@ void digi_set_digi_volume( int dvolume )
 	else
 		digi_volume = dvolume;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_sync_sounds();
 }
@@ -349,7 +349,7 @@ void digi_set_max_channels(int n) {
 	if (digi_max_channels > MAX_SOUND_SLOTS)
 		digi_max_channels = MAX_SOUND_SLOTS;
 
-	if ( !digi_initialised ) return;
+	if ( !Digi_initialized ) return;
 
 	digi_reset_digi_sounds();
 }
@@ -374,7 +374,7 @@ void digi_reset_digi_sounds() {
 
 int digi_is_channel_playing(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return 0;
 
 	return SoundSlots[channel].playing;
@@ -382,7 +382,7 @@ int digi_is_channel_playing(int channel)
 
 void digi_set_channel_volume(int channel, int volume)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -393,7 +393,7 @@ void digi_set_channel_volume(int channel, int volume)
 
 void digi_set_channel_pan(int channel, int pan)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -411,7 +411,7 @@ void digi_stop_sound(int channel)
 
 void digi_end_sound(int channel)
 {
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	if (!SoundSlots[channel].playing)
@@ -423,11 +423,11 @@ void digi_end_sound(int channel)
 
 #else
 int digi_midi_song_playing = 0;
-static int digi_initialised = 0;
+static int Digi_initialized = 0;
 int midi_volume = 255;
 
 int digi_get_settings() { return 0; }
-int digi_init() { digi_initialised = 1; return 0; }
+int digi_init() { Digi_initialized = 1; return 0; }
 void digi_reset() {}
 void digi_close() {}
 
@@ -474,7 +474,7 @@ void digi_set_midi_volume( int n )
 
 void digi_play_midi_song( char * filename, char * melodic_bank, char * drum_bank, int loop )
 {       
-	if (!digi_initialised) return;
+	if (!Digi_initialized) return;
 
         digi_stop_current_song();
 
@@ -508,7 +508,7 @@ void digi_debug()
 	int i;
 	int n_voices = 0;
 
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 
 	for (i = 0; i < digi_max_channels; i++)
diff --git a/arch/win32/midi.c b/arch/win32/midi.c
index 93670b1b..dbf8c0dc 100644
--- a/arch/win32/midi.c
+++ b/arch/win32/midi.c
@@ -43,7 +43,7 @@ void digi_set_midi_volume(int n)
 void digi_play_midi_song(char *filename, char *melodic_bank, char *drum_bank, int loop)
 {
 #if 0
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 #endif
 
@@ -73,7 +73,7 @@ int sound_paused = 0;
 void digi_pause_midi()
 {
 #if 0
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 #endif
 
@@ -87,7 +87,7 @@ void digi_pause_midi()
 void digi_resume_midi()
 {
 #if 0
-	if (!digi_initialised)
+	if (!Digi_initialized)
 		return;
 #endif
 
-- 
2.39.2