aboutsummaryrefslogtreecommitdiff
path: root/engines/cryo
diff options
context:
space:
mode:
authorStrangerke2017-01-03 17:02:22 -0800
committerEugene Sandulenko2017-01-25 22:42:20 +0100
commitb3fcb77053c54f79ab1ff047936163f7a3de74bb (patch)
treed06a6513f6ee67c43fca0d0a9fc5d445f8bc61e0 /engines/cryo
parentd748674193551d7815a98c6332b81761bcc0270f (diff)
downloadscummvm-rg350-b3fcb77053c54f79ab1ff047936163f7a3de74bb.tar.gz
scummvm-rg350-b3fcb77053c54f79ab1ff047936163f7a3de74bb.tar.bz2
scummvm-rg350-b3fcb77053c54f79ab1ff047936163f7a3de74bb.zip
CRYO: enforce private variables and function in SoundGroup and CSoundChannel
Diffstat (limited to 'engines/cryo')
-rw-r--r--engines/cryo/sound.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/engines/cryo/sound.h b/engines/cryo/sound.h
index 25129fcdfd..423e7ea73c 100644
--- a/engines/cryo/sound.h
+++ b/engines/cryo/sound.h
@@ -18,6 +18,8 @@ private:
unsigned int _sampleRate;
bool _stereo;
+ void applyVolumeChange();
+
public:
CSoundChannel(Audio::Mixer *mixer, unsigned int sampleRate, bool stereo);
~CSoundChannel();
@@ -37,9 +39,6 @@ public:
void setVolume(unsigned int volumeLeft, unsigned int volumeRight);
void setVolumeLeft(unsigned int volume);
void setVolumeRight(unsigned int volume);
-
-private:
- void applyVolumeChange();
};
#define kCryoMaxClSounds 64
@@ -48,21 +47,21 @@ class SoundGroup {
private:
CryoEngine *_vm;
+ Sound *_sounds[kCryoMaxClSounds];
+ int16 _numSounds;
+ int16 _soundIndex;
+ int16 _playIndex;
+ bool _forceWait;
+
public:
SoundGroup(CryoEngine *vm, int16 numSounds, int16 length, int16 sampleSize, float rate, int16 mode);
~SoundGroup();
- void reverse16All();
- void *getNextBuffer();
bool assignDatas(void *buffer, int length, bool isSigned);
- bool setDatas(void *data, int length, bool isSigned);
void playNextSample(SoundChannel *ch);
-
- Sound *_sounds[kCryoMaxClSounds];
- int16 _numSounds;
- int16 _soundIndex;
- int16 _playIndex;
- bool _forceWait;
+ void reverse16All();
+ bool setDatas(void *data, int length, bool isSigned);
+ void *getNextBuffer();
};
}