diff options
| -rw-r--r-- | dists/scummvm.6 | 4 | ||||
| -rw-r--r-- | engines/sci/sound/midiparser_sci.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 2 | ||||
| -rw-r--r-- | gui/launcher.cpp | 2 | ||||
| -rw-r--r-- | sound/mididrv.h | 2 | ||||
| -rw-r--r-- | sound/mixer.h | 2 | ||||
| -rw-r--r-- | sound/softsynth/opl/mame.cpp | 4 | ||||
| -rw-r--r-- | sound/softsynth/opl/mame.h | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/dists/scummvm.6 b/dists/scummvm.6 index 3f527ca564..b192104684 100644 --- a/dists/scummvm.6 +++ b/dists/scummvm.6 @@ -31,7 +31,7 @@ Music to use: .Bl -tag -width Ds .It Em adlib -Adlib emulation (default) +AdLib emulation (default) .It Em alsa Output using ALSA sequencer device .It Em amidi @@ -178,7 +178,7 @@ Look for additional game data in .It Fl -joystick= Ns Ar num Enable input with joystick (default: 0 = first joystick). .It Fl -multi-midi -Enable combination Adlib and native MIDI. +Enable combination AdLib and native MIDI. .It Fl -native-mt32 True Roland MT-32 MIDI (disable GM emulation). .It Fl --render-mode= Ns Ar mode diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index 6dbadf7db0..eab4d51489 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -208,7 +208,7 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) { break; // Unhandled SCI commands case 0x46: // LSL3 - binoculars - case 0x61: // Iceman (Adlib?) + case 0x61: // Iceman (AdLib?) case 0x73: // Hoyle case 0xD1: // KQ4, when riding the unicorn // Obscure SCI commands - ignored diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 64d2e284ce..6004ac62b3 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1278,7 +1278,7 @@ int ScummEngine::readSoundResource(int idx) { return 0; } -// Adlib MIDI-SYSEX to set MIDI instruments for small header games. +// AdLib MIDI-SYSEX to set MIDI instruments for small header games. static const byte ADLIB_INSTR_MIDI_HACK[95] = { 0x00, 0xf0, 0x14, 0x7d, 0x00, // sysex 00: part on/off 0x00, 0x00, 0x03, // part/channel (offset 5) diff --git a/gui/launcher.cpp b/gui/launcher.cpp index b86d524119..0b26c6c44e 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -823,7 +823,7 @@ void LauncherDialog::editGame(int item) { // default set nothing and use the global ScummVM settings. E.g. the user // can set here an optional alternate music volume, or for specific games // a different music driver etc. - // This is useful because e.g. MonkeyVGA needs Adlib music to have decent + // This is useful because e.g. MonkeyVGA needs AdLib music to have decent // music support etc. assert(item >= 0); String gameId(ConfMan.get("gameid", _domains[item])); diff --git a/sound/mididrv.h b/sound/mididrv.h index 3a03759f76..d7e89dd9ca 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -100,7 +100,7 @@ enum MidiDriverFlags { MDT_NONE = 0, MDT_PCSPK = 1 << 0, // PC Speaker: Maps to MD_PCSPK and MD_PCJR MDT_CMS = 1 << 1, // Creative Music System / Gameblaster: Maps to MD_CMS - MDT_ADLIB = 1 << 2, // Adlib: Maps to MD_ADLIB + MDT_ADLIB = 1 << 2, // AdLib: Maps to MD_ADLIB MDT_TOWNS = 1 << 3, // FM-TOWNS: Maps to MD_TOWNS MDT_MIDI = 1 << 4, // Real MIDI MDT_PREFER_MIDI = 1 << 5 // Real MIDI output is preferred diff --git a/sound/mixer.h b/sound/mixer.h index 0e12e83107..28ce62af2e 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -86,7 +86,7 @@ public: * Is the mixer ready and setup? This may not be the case on systems which * don't support digital sound output. In that case, the mixer proc may * never be called. That in turn can cause breakage in games which try to - * sync with an audio stream. In particular, the Adlib MIDI emulation... + * sync with an audio stream. In particular, the AdLib MIDI emulation... * * @return whether the mixer is ready and setup * diff --git a/sound/softsynth/opl/mame.cpp b/sound/softsynth/opl/mame.cpp index eaeda7846c..9e7cbfe3dc 100644 --- a/sound/softsynth/opl/mame.cpp +++ b/sound/softsynth/opl/mame.cpp @@ -53,7 +53,7 @@ bool OPL::init(int rate) { if (_opl) MAME::OPLDestroy(_opl); - _opl = MAME::makeAdlibOPL(rate); + _opl = MAME::makeAdLibOPL(rate); return (_opl != 0); } @@ -1208,7 +1208,7 @@ int OPLTimerOver(FM_OPL *OPL, int c) { return OPL->status >> 7; } -FM_OPL *makeAdlibOPL(int rate) { +FM_OPL *makeAdLibOPL(int rate) { // We need to emulate one YM3812 chip int env_bits = FMOPL_ENV_BITS_HQ; int eg_ent = FMOPL_EG_ENT_HQ; diff --git a/sound/softsynth/opl/mame.h b/sound/softsynth/opl/mame.h index 0c3bcde5db..b3614bfdcf 100644 --- a/sound/softsynth/opl/mame.h +++ b/sound/softsynth/opl/mame.h @@ -173,7 +173,7 @@ void OPLWriteReg(FM_OPL *OPL, int r, int v); void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length); // Factory method -FM_OPL *makeAdlibOPL(int rate); +FM_OPL *makeAdLibOPL(int rate); // OPL API implementation class OPL : public ::OPL::OPL { |