aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/sound.h
diff options
context:
space:
mode:
authorStrangerke2015-05-11 01:04:04 +0200
committerStrangerke2015-05-11 01:04:04 +0200
commit0d3750a768c8f9457530344fa6871b98dd20276b (patch)
tree67f80d97e90564d88e0b46e4a2d3feeede7df4ec /engines/sherlock/sound.h
parenteae3ff961001b9ce071873978e29310947d2212b (diff)
downloadscummvm-rg350-0d3750a768c8f9457530344fa6871b98dd20276b.tar.gz
scummvm-rg350-0d3750a768c8f9457530344fa6871b98dd20276b.tar.bz2
scummvm-rg350-0d3750a768c8f9457530344fa6871b98dd20276b.zip
SHERLOCK: Add preliminar sound support
Diffstat (limited to 'engines/sherlock/sound.h')
-rw-r--r--engines/sherlock/sound.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/sherlock/sound.h b/engines/sherlock/sound.h
index 56cd4ed0a8..213a6f7a1e 100644
--- a/engines/sherlock/sound.h
+++ b/engines/sherlock/sound.h
@@ -25,6 +25,11 @@
#include "common/scummsys.h"
#include "common/str.h"
+#include "audio/audiostream.h"
+#include "audio/mixer.h"
+#include "access/files.h"
+#include "audio/midiplayer.h"
+#include "audio/midiparser.h"
namespace Sherlock {
@@ -37,6 +42,10 @@ enum WaitType {
class Sound {
private:
SherlockEngine *_vm;
+ Audio::Mixer *_mixer;
+ Audio::SoundHandle _effectsHandle;
+
+ char decodeSample(char sample, byte& prediction, int& step);
public:
bool _digitized;
bool _music;
@@ -50,7 +59,7 @@ public:
bool *_soundIsOn;
byte *_digiBuf;
public:
- Sound(SherlockEngine *vm);
+ Sound(SherlockEngine *vm, Audio::Mixer *mixer);
void syncSoundSettings();
void loadSound(const Common::String &name, int priority);
@@ -64,7 +73,7 @@ public:
int loadSong(int songNumber);
void startSong();
void freeSong();
-
+
void playMusic(const Common::String &name);
void stopMusic();
void stopSndFuncPtr(int v1, int v2);