diff options
author | Einar Johan Trøan Sømåen | 2012-07-21 21:01:47 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-21 21:01:47 +0200 |
commit | b5a07fef8ebf29f7f44b15d9b34799c7e115fdad (patch) | |
tree | 76599c7b51aa6ad0447cb6ff6847f9eba54a679a /engines/wintermute/base/sound/base_sound.h | |
parent | 2e82471240804df65acdf51c43ea044cbb81ae68 (diff) | |
download | scummvm-rg350-b5a07fef8ebf29f7f44b15d9b34799c7e115fdad.tar.gz scummvm-rg350-b5a07fef8ebf29f7f44b15d9b34799c7e115fdad.tar.bz2 scummvm-rg350-b5a07fef8ebf29f7f44b15d9b34799c7e115fdad.zip |
WINTERMUTE: Get rid of the C-prefix for class-definitions.
Diffstat (limited to 'engines/wintermute/base/sound/base_sound.h')
-rw-r--r-- | engines/wintermute/base/sound/base_sound.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/wintermute/base/sound/base_sound.h b/engines/wintermute/base/sound/base_sound.h index ef52194090..0b033de47d 100644 --- a/engines/wintermute/base/sound/base_sound.h +++ b/engines/wintermute/base/sound/base_sound.h @@ -36,8 +36,8 @@ namespace WinterMute {
-class CBSoundBuffer;
-class CBSound : public CBBase {
+class BaseSoundBuffer;
+class BaseSound : public BaseClass {
public:
bool setPan(float pan);
int _soundPrivateVolume;
@@ -57,7 +57,7 @@ public: bool _soundLooping;
uint32 _soundLoopStart;
uint32 _soundPosition;
- DECLARE_PERSISTENT(CBSound, CBBase)
+ DECLARE_PERSISTENT(BaseSound, BaseClass)
bool resume();
bool pause(bool freezePaused = false);
bool stop();
@@ -68,8 +68,8 @@ public: char *_soundFilename;
bool setSoundSimple();
bool setSound(const char *filename, Audio::Mixer::SoundType type = Audio::Mixer::kSFXSoundType, bool streamed = false);
- CBSound(CBGame *inGame);
- virtual ~CBSound();
+ BaseSound(BaseGame *inGame);
+ virtual ~BaseSound();
bool ApplyFX(TSFXType type = SFX_NONE, float param1 = 0, float param2 = 0, float param3 = 0, float param4 = 0);
@@ -79,7 +79,7 @@ private: float _sFXParam2;
float _sFXParam3;
float _sFXParam4;
- CBSoundBuffer *_sound;
+ BaseSoundBuffer *_sound;
};
|