[Scummvm-cvs-logs] scummvm master -> 70a694ce43524539b03f9142729b58f5efd47bf4

[lordhoto]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5a0eb6ba60 SCUMM: Fix some valgrind warnings in CMS code.
018e304916 SCUMM: Slight cleanup in CMS code.
70a694ce43 SCUMM: Remove unneeded members in CMS class.


Commit: 5a0eb6ba60f7d4074e1cacb66daf5618beabf750
    https://github.com/scummvm/scummvm/commit/5a0eb6ba60f7d4074e1cacb66daf5618beabf750
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-05T18:28:42-07:00

Commit Message:
SCUMM: Fix some valgrind warnings in CMS code.

Changed paths:
    engines/scumm/player_v2cms.cpp



diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player_v2cms.cpp
index c39b360..96a1ba1 100644
--- a/engines/scumm/player_v2cms.cpp
+++ b/engines/scumm/player_v2cms.cpp
@@ -146,10 +146,12 @@ Player_V2CMS::Player_V2CMS(ScummEngine *scumm, Audio::Mixer *mixer)
 	memset(_cmsVoicesBase, 0, sizeof(Voice)*16);
 	memset(_cmsVoices, 0, sizeof(Voice2)*8);
 	memset(_cmsChips, 0, sizeof(MusicChip)*2);
-	_midiDelay = _octaveMask = _looping = _tempo = 0;
+	_midiDelay = _octaveMask = _looping = _tempo = _tempoSum = 0;
 	_midiData = _midiSongBegin = 0;
 	_musicTimer = _musicTimerTicks = 0;
+	_clkFrequenz = 0;
 	_loadedMidiSong = 0;
+	_outputTableReady = 0;
 	memset(_midiChannel, 0, sizeof(Voice2*)*16);
 	memset(_midiChannelUse, 0, sizeof(byte)*16);
 


Commit: 018e304916c8086a721ba54fa020a09dc00d069d
    https://github.com/scummvm/scummvm/commit/018e304916c8086a721ba54fa020a09dc00d069d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-05T18:28:42-07:00

Commit Message:
SCUMM: Slight cleanup in CMS code.

Changed paths:
    engines/scumm/player_v2cms.cpp
    engines/scumm/player_v2cms.h



diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player_v2cms.cpp
index 96a1ba1..9908ba5 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 ba2c3f2..f8a6642 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;
 


Commit: 70a694ce43524539b03f9142729b58f5efd47bf4
    https://github.com/scummvm/scummvm/commit/70a694ce43524539b03f9142729b58f5efd47bf4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-05T18:28:42-07:00

Commit Message:
SCUMM: Remove unneeded members in CMS class.

Changed paths:
    engines/scumm/player_v2cms.h



diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player_v2cms.h
index f8a6642..01bbfa5 100644
--- a/engines/scumm/player_v2cms.h
+++ b/engines/scumm/player_v2cms.h
@@ -129,8 +129,6 @@ protected:
 	byte _lastMidiCommand;
 	uint _outputTableReady;
 	byte _voiceTimer;
-	byte _restart;
-	byte _curSno;
 
 	int _musicTimer, _musicTimerTicks;