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/musicbase.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/musicbase.cpp')
| -rw-r--r-- | engines/sky/music/musicbase.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp index 9bf7a62a21..17d022e774 100644 --- a/engines/sky/music/musicbase.cpp +++ b/engines/sky/music/musicbase.cpp @@ -31,7 +31,6 @@ namespace Sky { MusicBase::MusicBase(Disk *pDisk) { - _musicData = NULL; _skyDisk = pDisk; _currentMusic = 0; @@ -40,14 +39,12 @@ MusicBase::MusicBase(Disk *pDisk) { } MusicBase::~MusicBase(void) { - stopMusic(); if (_musicData) free(_musicData); } void MusicBase::loadSection(uint8 pSection) { - _mutex.lock(); if (_currentMusic) stopMusicInternal(); @@ -67,7 +64,6 @@ void MusicBase::loadSection(uint8 pSection) { } bool MusicBase::musicIsPlaying(void) { - for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) if (_channels[cnt]->isActive()) return true; @@ -75,21 +71,18 @@ bool MusicBase::musicIsPlaying(void) { } void MusicBase::stopMusic(void) { - _mutex.lock(); stopMusicInternal(); _mutex.unlock(); } void MusicBase::stopMusicInternal(void) { - for (uint8 cnt = 0; cnt < _numberOfChannels; cnt++) delete _channels[cnt]; _numberOfChannels = 0; } void MusicBase::updateTempo(void) { - uint16 tempoMul = _musicTempo0 * _musicTempo1; uint16 divisor = 0x4446390/ 23864; _tempo = (tempoMul / divisor) << 16; @@ -97,7 +90,6 @@ void MusicBase::updateTempo(void) { } void MusicBase::loadNewMusic(void) { - uint16 musicPos; if (_onNextPoll.musicToProcess > _musicData[_musicDataLoc]) { error("Music %d requested but doesn't exist in file.", _onNextPoll.musicToProcess); @@ -123,7 +115,6 @@ void MusicBase::loadNewMusic(void) { } void MusicBase::pollMusic(void) { - _mutex.lock(); uint8 newTempo; if (_onNextPoll.musicToProcess != _currentMusic) |