Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.

Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279

9 files changed, 29 insertions, 29 deletions

diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index 80b08f7ad4..3a672d57b5 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -152,7 +152,7 @@ bool IMuseInternal::isMT32(int sound) {
 	tag = READ_BE_UINT32(ptr + 4);
 	switch (tag) {
 	case MKID_BE('ADL '):
-	case MKID_BE('ASFX'): // Special AD class for old Adlib sound effects
+	case MKID_BE('ASFX'): // Special AD class for old AdLib sound effects
 	case MKID_BE('SPK '):
 		return false;
 
@@ -199,7 +199,7 @@ bool IMuseInternal::isMIDI(int sound) {
 	tag = READ_BE_UINT32(ptr + 4);
 	switch (tag) {
 	case MKID_BE('ADL '):
-	case MKID_BE('ASFX'): // Special AD class for old Adlib sound effects
+	case MKID_BE('ASFX'): // Special AD class for old AdLib sound effects
 	case MKID_BE('SPK '):
 		return false;
 
@@ -235,7 +235,7 @@ MidiDriver *IMuseInternal::getBestMidiDriver(int sound) {
 		if (_midi_native) {
 			driver = _midi_native;
 		} else {
-			// Route it through Adlib anyway.
+			// Route it through AdLib anyway.
 			driver = _midi_adlib;
 		}
 	} else {
@@ -1709,13 +1709,13 @@ void IMuseInternal::reallocateMidiChannels(MidiDriver *midi) {
 	}
 }
 
-void IMuseInternal::setGlobalAdlibInstrument(byte slot, byte *data) {
+void IMuseInternal::setGlobalAdLibInstrument(byte slot, byte *data) {
 	if (slot < 32) {
 		_global_adlib_instruments[slot].adlib(data);
 	}
 }
 
-void IMuseInternal::copyGlobalAdlibInstrument(byte slot, Instrument *dest) {
+void IMuseInternal::copyGlobalAdLibInstrument(byte slot, Instrument *dest) {
 	if (slot >= 32)
 		return;
 	_global_adlib_instruments[slot].copy_to(dest);
diff --git a/engines/scumm/imuse/imuse_internal.h b/engines/scumm/imuse/imuse_internal.h
index 93244b8c1d..172bcaecd4 100644
--- a/engines/scumm/imuse/imuse_internal.h
+++ b/engines/scumm/imuse/imuse_internal.h
@@ -503,8 +503,8 @@ protected:
 	int setImuseMasterVolume(uint vol);
 
 	void reallocateMidiChannels(MidiDriver *midi);
-	void setGlobalAdlibInstrument(byte slot, byte *data);
-	void copyGlobalAdlibInstrument(byte slot, Instrument *dest);
+	void setGlobalAdLibInstrument(byte slot, byte *data);
+	void copyGlobalAdLibInstrument(byte slot, Instrument *dest);
 	bool isNativeMT32() { return _native_mt32; }
 
 protected:
diff --git a/engines/scumm/imuse/imuse_part.cpp b/engines/scumm/imuse/imuse_part.cpp
index 04bc4a2389..40889ec24f 100644
--- a/engines/scumm/imuse/imuse_part.cpp
+++ b/engines/scumm/imuse/imuse_part.cpp
@@ -200,7 +200,7 @@ void Part::set_instrument(byte * data) {
 }
 
 void Part::load_global_instrument(byte slot) {
-	_player->_se->copyGlobalAdlibInstrument(slot, &_instrument);
+	_player->_se->copyGlobalAdLibInstrument(slot, &_instrument);
 	if (clearToTransmit())
 		_instrument.send(_mc);
 }
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 4376a94d99..73aec472e4 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -374,7 +374,7 @@ void Player::sysEx(const byte *p, uint16 len) {
 			_midi->sysEx_customInstrument(p[0], 'EUP ', p + 1);
 		} else {
 			// SysEx manufacturer 0x97 has been spotted in the
-			// Monkey Island 2 Adlib music, so don't make this a
+			// Monkey Island 2 AdLib music, so don't make this a
 			// fatal error. See bug #1481383.
 			if (a == 0)
 				warning("Unknown SysEx manufacturer 0x00 0x%02X 0x%02X", p[0], p[1]);
diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp
index bc8380f1b1..efe15f308f 100644
--- a/engines/scumm/imuse/instrument.cpp
+++ b/engines/scumm/imuse/instrument.cpp
@@ -144,12 +144,12 @@ public:
 				: (MidiDriver::_mt32ToGm[_program] < 128)); }
 };
 
-class Instrument_Adlib : public InstrumentInternal {
+class Instrument_AdLib : public InstrumentInternal {
 private:
 
 #include "common/pack-start.h"	// START STRUCT PACKING
 
-	struct AdlibInstrument {
+	struct AdLibInstrument {
 		byte flags_1;
 		byte oplvl_1;
 		byte atdec_1;
@@ -170,11 +170,11 @@ private:
 
 #include "common/pack-end.h"	// END STRUCT PACKING
 
-	AdlibInstrument _instrument;
+	AdLibInstrument _instrument;
 
 public:
-	Instrument_Adlib(const byte *data);
-	Instrument_Adlib(Serializer *s);
+	Instrument_AdLib(const byte *data);
+	Instrument_AdLib(Serializer *s);
 	void saveOrLoad(Serializer *s);
 	void send(MidiChannel *mc);
 	void copy_to(Instrument *dest) { dest->adlib((byte *)&_instrument); }
@@ -290,8 +290,8 @@ void Instrument::adlib(const byte *instrument) {
 	clear();
 	if (!instrument)
 		return;
-	_type = itAdlib;
-	_instrument = new Instrument_Adlib(instrument);
+	_type = itAdLib;
+	_instrument = new Instrument_AdLib(instrument);
 }
 
 void Instrument::roland(const byte *instrument) {
@@ -316,8 +316,8 @@ void Instrument::saveOrLoad (Serializer *s) {
 		case itProgram:
 			_instrument = new Instrument_Program(s);
 			break;
-		case itAdlib:
-			_instrument = new Instrument_Adlib(s);
+		case itAdLib:
+			_instrument = new Instrument_AdLib(s);
 			break;
 		case itRoland:
 			_instrument = new Instrument_Roland(s);
@@ -371,29 +371,29 @@ void Instrument_Program::send(MidiChannel *mc) {
 
 ////////////////////////////////////////
 //
-// Instrument_Adlib class members
+// Instrument_AdLib class members
 //
 ////////////////////////////////////////
 
-Instrument_Adlib::Instrument_Adlib(const byte *data) {
+Instrument_AdLib::Instrument_AdLib(const byte *data) {
 	memcpy(&_instrument, data, sizeof(_instrument));
 }
 
-Instrument_Adlib::Instrument_Adlib(Serializer *s) {
+Instrument_AdLib::Instrument_AdLib(Serializer *s) {
 	if (!s->isSaving())
 		saveOrLoad(s);
 	else
 		memset(&_instrument, 0, sizeof(_instrument));
 }
 
-void Instrument_Adlib::saveOrLoad(Serializer *s) {
+void Instrument_AdLib::saveOrLoad(Serializer *s) {
 	if (s->isSaving())
 		s->saveBytes(&_instrument, sizeof(_instrument));
 	else
 		s->loadBytes(&_instrument, sizeof(_instrument));
 }
 
-void Instrument_Adlib::send(MidiChannel *mc) {
+void Instrument_AdLib::send(MidiChannel *mc) {
 	mc->sysEx_customInstrument('ADL ', (byte *)&_instrument);
 }
 
diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h
index 4d4e40c528..f6108daf16 100644
--- a/engines/scumm/imuse/instrument.h
+++ b/engines/scumm/imuse/instrument.h
@@ -54,7 +54,7 @@ public:
 	enum {
 		itNone = 0,
 		itProgram = 1,
-		itAdlib = 2,
+		itAdLib = 2,
 		itRoland = 3
 	};
 
diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp
index 87873d1693..c96b2f757b 100644
--- a/engines/scumm/imuse/sysex_scumm.cpp
+++ b/engines/scumm/imuse/sysex_scumm.cpp
@@ -103,7 +103,7 @@ void sysexHandler_Scumm(Player *player, const byte *msg, uint16 len) {
 	case 2: // Start of song. Ignore for now.
 		break;
 
-	case 16: // Adlib instrument definition(Part)
+	case 16: // AdLib instrument definition(Part)
 		a = *p++ & 0x0F;
 		++p; // Skip hardware type
 		part = player->getPart(a);
@@ -118,11 +118,11 @@ void sysexHandler_Scumm(Player *player, const byte *msg, uint16 len) {
 		}
 		break;
 
-	case 17: // Adlib instrument definition(Global)
+	case 17: // AdLib instrument definition(Global)
 		p += 2; // Skip hardware type and... whatever came right before it
 		a = *p++;
 		player->decode_sysex_bytes(p, buf, len - 3);
-		se->setGlobalAdlibInstrument(a, buf);
+		se->setGlobalAdLibInstrument(a, buf);
 		break;
 
 	case 33: // Parameter adjust
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 2478a1c819..e474e8b5a8 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1691,7 +1691,7 @@ void ScummEngine::setupMusic(int midi) {
 		if (missingFile) {
 			GUI::MessageDialog dialog(
 				"Native MIDI support requires the Roland Upgrade from LucasArts,\n"
-				"but " + fileName + " is missing. Using Adlib instead.", "Ok");
+				"but " + fileName + " is missing. Using AdLib instead.", "Ok");
 			dialog.runModal();
 			_musicType = MDT_ADLIB;
 		}
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index e1614ecda5..f2031d197a 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -702,7 +702,7 @@ void ScummEngine::resetScummVars() {
 		// 0 PC Speaker
 		// 1 Tandy
 		// 2 CMS
-		// 3 Adlib
+		// 3 AdLib
 		// 4 Roland
 		switch (_musicType) {
 		case MDT_NONE: