aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-06 03:26:40 +0200
committerJohannes Schickel2011-08-06 03:28:42 +0200
commit018e304916c8086a721ba54fa020a09dc00d069d (patch)
tree02fa3d1e320d197bd07673eaa66bfd95f012e78c
parent5a0eb6ba60f7d4074e1cacb66daf5618beabf750 (diff)
downloadscummvm-rg350-018e304916c8086a721ba54fa020a09dc00d069d.tar.gz
scummvm-rg350-018e304916c8086a721ba54fa020a09dc00d069d.tar.bz2
scummvm-rg350-018e304916c8086a721ba54fa020a09dc00d069d.zip
SCUMM: Slight cleanup in CMS code.
-rw-r--r--engines/scumm/player_v2cms.cpp6
-rw-r--r--engines/scumm/player_v2cms.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player_v2cms.cpp
index 96a1ba1332..9908ba5253 100644
--- a/engines/scumm/player_v2cms.cpp
+++ b/engines/scumm/player_v2cms.cpp
@@ -149,7 +149,7 @@ Player_V2CMS::Player_V2CMS(ScummEngine *scumm, Audio::Mixer *mixer)
_midiDelay = _octaveMask = _looping = _tempo = _tempoSum = 0;
_midiData = _midiSongBegin = 0;
_musicTimer = _musicTimerTicks = 0;
- _clkFrequenz = 0;
+ _voiceTimer = 0;
_loadedMidiSong = 0;
_outputTableReady = 0;
memset(_midiChannel, 0, sizeof(Voice2*)*16);
@@ -434,8 +434,8 @@ int Player_V2CMS::readBuffer(int16 *buffer, const int numSamples) {
do {
if (!(_next_tick >> FIXP_SHIFT)) {
if (_midiData) {
- --_clkFrequenz;
- if (!(_clkFrequenz & 0x01))
+ --_voiceTimer;
+ if (!(_voiceTimer & 0x01))
playVoice();
int newTempoSum = _tempo + _tempoSum;
diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player_v2cms.h
index ba2c3f25d8..f8a6642ff4 100644
--- a/engines/scumm/player_v2cms.h
+++ b/engines/scumm/player_v2cms.h
@@ -128,7 +128,7 @@ protected:
byte _lastMidiCommand;
uint _outputTableReady;
- byte _clkFrequenz;
+ byte _voiceTimer;
byte _restart;
byte _curSno;