diff options
| author | Johannes Schickel | 2010-01-25 00:13:32 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-25 00:13:32 +0000 |
| commit | 69071078b331f91e16827f8a29d221b6a9c732e3 (patch) | |
| tree | dd0f32c5fff9aedce54c6eda4535dde992a886c5 /sound | |
| parent | 1a6573ab66d90bab9d3f73f26414a0aee05353bd (diff) | |
| download | scummvm-rg350-69071078b331f91e16827f8a29d221b6a9c732e3.tar.gz scummvm-rg350-69071078b331f91e16827f8a29d221b6a9c732e3.tar.bz2 scummvm-rg350-69071078b331f91e16827f8a29d221b6a9c732e3.zip | |
Replace some more Adlib uses by AdLib.
svn-id: r47530
Diffstat (limited to 'sound')
| -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 |
4 files changed, 5 insertions, 5 deletions
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 { |