diff options
| author | Paul Gilbert | 2015-11-21 14:34:08 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2015-11-21 14:34:08 -0500 |
| commit | 0ade2da5f1647ae1942a2a3e7aa26f219e5b7a2d (patch) | |
| tree | 337bf1249638e3a8686799600b3207b1f79ba1ca | |
| parent | b6e39dbf79801b5d96ca9292a47825d39f1e3fb4 (diff) | |
| download | scummvm-rg350-0ade2da5f1647ae1942a2a3e7aa26f219e5b7a2d.tar.gz scummvm-rg350-0ade2da5f1647ae1942a2a3e7aa26f219e5b7a2d.tar.bz2 scummvm-rg350-0ade2da5f1647ae1942a2a3e7aa26f219e5b7a2d.zip | |
XEEN: Further work on VOC sound method prototypes
| -rw-r--r-- | engines/xeen/sound.h | 15 | ||||
| -rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_game.cpp | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/engines/xeen/sound.h b/engines/xeen/sound.h index b44bff7f30..fae3d76dba 100644 --- a/engines/xeen/sound.h +++ b/engines/xeen/sound.h @@ -29,14 +29,15 @@ namespace Xeen { +class SoundManager; + class VOC: public Common::File { + friend class SoundManager; +private: + SoundManager *_sound; public: - virtual ~VOC(); - - /** - * Play the given loaded sound - */ - void play(); + VOC() : _sound(nullptr) {} + virtual ~VOC() { stop(); } /** * Stop playing the sound @@ -58,6 +59,8 @@ public: void playSong(Common::SeekableReadStream &f) {} + void playSound(VOC &voc) {} + void playSample(const Common::SeekableReadStream *stream, int v2 = 1) {} bool playSample(int v1, int v2) { return false; } diff --git a/engines/xeen/worldofxeen/worldofxeen_game.cpp b/engines/xeen/worldofxeen/worldofxeen_game.cpp index 836f039cf6..665507d915 100644 --- a/engines/xeen/worldofxeen/worldofxeen_game.cpp +++ b/engines/xeen/worldofxeen/worldofxeen_game.cpp @@ -83,7 +83,7 @@ void WorldOfXeenEngine::showDarkSideTitle() { switch (idx) { case 17: - _sound->proc2(voc[0]); + _sound->playSound(voc[0]); break; case 34: case 44: @@ -91,7 +91,7 @@ void WorldOfXeenEngine::showDarkSideTitle() { nwcFrame = 0; break; case 35: - _sound->proc2(voc[1]); + _sound->playSound(voc[1]); break; default: ++nwcFrame; |