aboutsummaryrefslogtreecommitdiff
path: root/sword1/sound.h
diff options
context:
space:
mode:
authorRobert Göffringmann2004-10-12 15:50:00 +0000
committerRobert Göffringmann2004-10-12 15:50:00 +0000
commitf5403e079fbfa5348d1e9f084ed215dc40314655 (patch)
tree26e26226a62300da230ace3ba52490581bc85d59 /sword1/sound.h
parentbeb1ed459892216f1655c6041adf25eb2bf9ae83 (diff)
downloadscummvm-rg350-f5403e079fbfa5348d1e9f084ed215dc40314655.tar.gz
scummvm-rg350-f5403e079fbfa5348d1e9f084ed215dc40314655.tar.bz2
scummvm-rg350-f5403e079fbfa5348d1e9f084ed215dc40314655.zip
added mp3 and ogg vorbis playback for music and speech.
compression tool will follow soon. svn-id: r15531
Diffstat (limited to 'sword1/sound.h')
-rw-r--r--sword1/sound.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/sword1/sound.h b/sword1/sound.h
index df0d17376c..ece8f7e3e2 100644
--- a/sword1/sound.h
+++ b/sword1/sound.h
@@ -58,9 +58,16 @@ class ResMan;
#define WAVE_VOL_TAB_LENGTH 480
#define WAVE_VOL_THRESHOLD 190000 //120000
+enum CowMode {
+ CowWave = 0,
+ CowMp3,
+ CowVorbis,
+ CowDemo
+};
+
class Sound {
public:
- Sound(const char *searchPath, SoundMixer *mixer, ResMan *pResMan, bool isDemo);
+ 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; };
@@ -93,6 +100,7 @@ private:
uint32 *_cowHeader;
uint32 _cowHeaderSize;
uint8 _currentCowFile;
+ CowMode _cowMode;
PlayingSoundHandle _speechHandle, _fxHandle;
Common::RandomSource _rnd;
@@ -100,7 +108,6 @@ private:
uint8 _endOfQueue;
SoundMixer *_mixer;
ResMan *_resMan;
- bool _isDemo;
char _filePath[100];
static const char _musicList[270];
static const uint16 _roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM];