aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/player_v2cms.h
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-07 16:49:25 +0200
committerJohannes Schickel2011-08-07 16:49:25 +0200
commitacffd12d0718ceb0be4cf18c7d60ead33723fd9c (patch)
treebea9f1b881a0d77f2e8f5c6f1991d55be3f98540 /engines/scumm/player_v2cms.h
parent26b6fd59307b2d4997860777bded3fddd3e11bee (diff)
downloadscummvm-rg350-acffd12d0718ceb0be4cf18c7d60ead33723fd9c.tar.gz
scummvm-rg350-acffd12d0718ceb0be4cf18c7d60ead33723fd9c.tar.bz2
scummvm-rg350-acffd12d0718ceb0be4cf18c7d60ead33723fd9c.zip
SCUMM: Further clean up of the CMS code.
Diffstat (limited to 'engines/scumm/player_v2cms.h')
-rw-r--r--engines/scumm/player_v2cms.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player_v2cms.h
index 9faec5e7ac..cbad46fe5d 100644
--- a/engines/scumm/player_v2cms.h
+++ b/engines/scumm/player_v2cms.h
@@ -156,10 +156,20 @@ private:
Voice2 *getFreeVoice();
Voice2 *getPlayVoice(byte param);
- // from Player_V2
-protected:
- CMSEmulator *_cmsEmu;
+ struct MidiNote {
+ byte frequency;
+ byte baseOctave;
+ };
+
+ static const MidiNote _midiNotes[132];
+ static const byte _attackRate[16];
+ static const byte _decayRate[16];
+ static const byte _sustainRate[16];
+ static const byte _releaseRate[16];
+ static const byte _volumeTable[16];
+ static const byte _cmsInitData[26];
+ CMSEmulator *_cmsEmu;
};
} // End of namespace Scumm