aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/player_v2cms.h
diff options
context:
space:
mode:
authorJohannes Schickel2011-08-07 15:56:49 +0200
committerJohannes Schickel2011-08-07 15:56:49 +0200
commit6bd9cd33d94867e6cf8fb72b5314d8ed586d8b33 (patch)
tree68350ffd46364f91215e0b68ff970fb26d79ea58 /engines/scumm/player_v2cms.h
parent28004ac8d961b94384f50c5f961ff3352c4289ef (diff)
downloadscummvm-rg350-6bd9cd33d94867e6cf8fb72b5314d8ed586d8b33.tar.gz
scummvm-rg350-6bd9cd33d94867e6cf8fb72b5314d8ed586d8b33.tar.bz2
scummvm-rg350-6bd9cd33d94867e6cf8fb72b5314d8ed586d8b33.zip
SCUMM: Cleanup CMS code a bit.
Diffstat (limited to 'engines/scumm/player_v2cms.h')
-rw-r--r--engines/scumm/player_v2cms.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player_v2cms.h
index 01bbfa5be1..1b825150f5 100644
--- a/engines/scumm/player_v2cms.h
+++ b/engines/scumm/player_v2cms.h
@@ -48,11 +48,8 @@ public:
// AudioStream API
int readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const { return true; }
- bool endOfData() const { return false; }
- int getRate() const { return _sampleRate; }
-
-protected:
+private:
#include "common/pack-start.h" // START STRUCT PACKING
struct Voice {
byte attack;
@@ -90,7 +87,14 @@ protected:
int8 unkRate;
int8 unkCount;
- int nextProcessState;
+ enum EnvelopeState {
+ kEnvelopeAttack,
+ kEnvelopeDecay,
+ kEnvelopeSustain,
+ kEnvelopeRelease
+ };
+
+ EnvelopeState nextProcessState;
uint8 curVolume;
uint8 curOctave;
uint8 curFreq;