diff options
author | Joost Peters | 2009-02-13 16:55:16 +0000 |
---|---|---|
committer | Joost Peters | 2009-02-13 16:55:16 +0000 |
commit | f051fbb9d811d63c20c4a8d1232c877574922b4a (patch) | |
tree | 5817e04d528644ef8d8d9096cbb552e0ea73dfcd /engines/sky/music/adlibmusic.cpp | |
parent | 501b3215323fac6efbd5cbd5168e6118263f2809 (diff) | |
download | scummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.tar.gz scummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.tar.bz2 scummvm-rg350-f051fbb9d811d63c20c4a8d1232c877574922b4a.zip |
Formatting changes / consistency
svn-id: r36304
Diffstat (limited to 'engines/sky/music/adlibmusic.cpp')
-rw-r--r-- | engines/sky/music/adlibmusic.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 4434f4cd68..77852786fd 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -33,9 +33,7 @@ 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(); @@ -46,13 +44,11 @@ AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk) } AdlibMusic::~AdlibMusic(void) { - OPLDestroy(_opl); _mixer->stopHandle(_soundHandle); } int AdlibMusic::readBuffer(int16 *data, const int numSamples) { - if (_musicData == NULL) { // no music loaded memset(data, 0, numSamples * sizeof(int16)); @@ -81,7 +77,6 @@ int AdlibMusic::readBuffer(int16 *data, const int numSamples) { } void AdlibMusic::setupPointers(void) { - if (SkyEngine::_systemVars.gameVersion == 109) { // disk demo uses a different adlib driver version, some offsets have changed //_musicDataLoc = (_musicData[0x11CC] << 8) | _musicData[0x11CB]; @@ -100,7 +95,6 @@ void AdlibMusic::setupPointers(void) { } void AdlibMusic::setupChannels(uint8 *channelData) { - _numberOfChannels = channelData[0]; channelData++; for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) { @@ -110,7 +104,6 @@ void AdlibMusic::setupChannels(uint8 *channelData) { } void AdlibMusic::startDriver(void) { - uint16 cnt = 0; while (_initSequence[cnt] || _initSequence[cnt + 1]) { OPLWriteReg (_opl, _initSequence[cnt], _initSequence[cnt + 1]); |