diff options
author | Torbjörn Andersson | 2004-01-11 15:47:41 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-01-11 15:47:41 +0000 |
commit | cf0a73f913174599c7c28d910ecd87229fd62afd (patch) | |
tree | 7eabb5c16878d42f35d811ed13af5ed20b763f92 /sword1/sound.h | |
parent | 563d95c576c817a63ec64302e67b2ee5daa97c6e (diff) | |
download | scummvm-rg350-cf0a73f913174599c7c28d910ecd87229fd62afd.tar.gz scummvm-rg350-cf0a73f913174599c7c28d910ecd87229fd62afd.tar.bz2 scummvm-rg350-cf0a73f913174599c7c28d910ecd87229fd62afd.zip |
Introduced new namespace, Sword1, removing the "Sword" and "Bs" prefixes in
the process, except for SwordEngine.
Some minor cleanups along the wa, e.g. stdafx.h already includes <stdio.h>,
<stdlib.h> and <math.h> so there shouldn't be any need to do it elsewhere.
svn-id: r12320
Diffstat (limited to 'sword1/sound.h')
-rw-r--r-- | sword1/sound.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sword1/sound.h b/sword1/sound.h index ad06a93daf..dcb2543653 100644 --- a/sword1/sound.h +++ b/sword1/sound.h @@ -28,6 +28,10 @@ #include "sound/mixer.h" #include "common/util.h" +class SoundMixer; + +namespace Sword1 { + #define TOTAL_FX_PER_ROOM 7 // total loop & random fx per room (see fx_list.c) #define MAX_ROOMS_PER_FX 7 // max no. of rooms in the fx's room,vol list #define MAX_FXQ_LENGTH 32 // max length of sound queue - ie. max number of fx that can be stored up/playing together @@ -50,15 +54,14 @@ struct FxDef { RoomVol roomVolList[MAX_ROOMS_PER_FX]; }; -class SoundMixer; class ResMan; #define WAVE_VOL_TAB_LENGTH 480 #define WAVE_VOL_THRESHOLD 190000 //120000 -class SwordSound { +class Sound { public: - SwordSound(const char *searchPath, SoundMixer *mixer, ResMan *pResMan); - ~SwordSound(void); + Sound(const char *searchPath, SoundMixer *mixer, ResMan *pResMan); + ~Sound(void); void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; }; void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; }; void giveSpeechVol(uint8 *volL, uint8 *volR) { *volL = _speechVolL; *volR = _speechVolR; }; @@ -103,4 +106,6 @@ private: static const FxDef _fxList[312]; }; +} // End of namespace Sword1 + #endif //BSSOUND_H |