From 0d995c592046aadbfcb8f46a252537da312912c5 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 12 Jan 2010 21:07:56 +0000 Subject: 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 --- engines/scumm/imuse/imuse.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/scumm/imuse/imuse.cpp') 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); -- cgit v1.2.3