diff options
author | Johannes Schickel | 2010-01-12 21:07:56 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-01-12 21:07:56 +0000 |
commit | 0d995c592046aadbfcb8f46a252537da312912c5 (patch) | |
tree | 95a0a8d25372f887fe656f6ba61f050cc28845d4 /engines/sky/music/adlibmusic.cpp | |
parent | 1ebe047972e2df513449db6aa615f6ab17dd6fb7 (diff) | |
download | scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.tar.gz scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.tar.bz2 scummvm-rg350-0d995c592046aadbfcb8f46a252537da312912c5.zip |
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
Diffstat (limited to 'engines/sky/music/adlibmusic.cpp')
-rw-r--r-- | engines/sky/music/adlibmusic.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 74735b30d8..0ceec7a07f 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -33,22 +33,22 @@ namespace Sky { -AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pDisk) { +AdLibMusic::AdLibMusic(Audio::Mixer *pMixer, Disk *pDisk) : MusicBase(pDisk) { _driverFileBase = 60202; _mixer = pMixer; _sampleRate = pMixer->getOutputRate(); - _opl = makeAdlibOPL(_sampleRate); + _opl = makeAdLibOPL(_sampleRate); _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true); } -AdlibMusic::~AdlibMusic() { +AdLibMusic::~AdLibMusic() { OPLDestroy(_opl); _mixer->stopHandle(_soundHandle); } -int AdlibMusic::readBuffer(int16 *data, const int numSamples) { +int AdLibMusic::readBuffer(int16 *data, const int numSamples) { if (_musicData == NULL) { // no music loaded memset(data, 0, numSamples * sizeof(int16)); @@ -76,7 +76,7 @@ int AdlibMusic::readBuffer(int16 *data, const int numSamples) { return numSamples; } -void AdlibMusic::setupPointers() { +void AdLibMusic::setupPointers() { if (SkyEngine::_systemVars.gameVersion == 109) { // disk demo uses a different adlib driver version, some offsets have changed //_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB]; @@ -94,16 +94,16 @@ void AdlibMusic::setupPointers() { _nextMusicPoll = 0; } -void AdlibMusic::setupChannels(uint8 *channelData) { +void AdLibMusic::setupChannels(uint8 *channelData) { _numberOfChannels = channelData[0]; channelData++; for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) { uint16 chDataStart = READ_LE_UINT16((uint16 *)channelData + cnt) + _musicDataLoc; - _channels[cnt] = new AdlibChannel(_opl, _musicData, chDataStart); + _channels[cnt] = new AdLibChannel(_opl, _musicData, chDataStart); } } -void AdlibMusic::startDriver() { +void AdLibMusic::startDriver() { uint16 cnt = 0; while (_initSequence[cnt] || _initSequence[cnt + 1]) { OPLWriteReg (_opl, _initSequence[cnt], _initSequence[cnt + 1]); @@ -111,20 +111,20 @@ void AdlibMusic::startDriver() { } } -void AdlibMusic::setVolume(uint16 param) { +void AdLibMusic::setVolume(uint16 param) { _musicVolume = param; _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 2 * param); } -bool AdlibMusic::isStereo() const { +bool AdLibMusic::isStereo() const { return false; } -bool AdlibMusic::endOfData() const { +bool AdLibMusic::endOfData() const { return false; } -int AdlibMusic::getRate() const { +int AdLibMusic::getRate() const { return _sampleRate; } |