diff options
| author | Max Horn | 2004-11-27 15:58:18 +0000 |
|---|---|---|
| committer | Max Horn | 2004-11-27 15:58:18 +0000 |
| commit | ba74a8e7f657cf795046a5cf6a7ead701fd4194e (patch) | |
| tree | 0d05c0dfa38e10542ca83ffeeb37ddd782c56ef7 /queen/sound.cpp | |
| parent | b78ac6a18b2cb851718ef84b04557f7fba8d399a (diff) | |
| download | scummvm-rg350-ba74a8e7f657cf795046a5cf6a7ead701fd4194e.tar.gz scummvm-rg350-ba74a8e7f657cf795046a5cf6a7ead701fd4194e.tar.bz2 scummvm-rg350-ba74a8e7f657cf795046a5cf6a7ead701fd4194e.zip | |
Added some more mixer doxygen docs; cleaned up Mixer API a bit, removing some very specialised methods
svn-id: r15914
Diffstat (limited to 'queen/sound.cpp')
| -rw-r--r-- | queen/sound.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/queen/sound.cpp b/queen/sound.cpp index 7ff117ec82..68e64efbe9 100644 --- a/queen/sound.cpp +++ b/queen/sound.cpp @@ -27,6 +27,10 @@ #include "queen/queen.h" #include "queen/resource.h" +#include "sound/flac.h" +#include "sound/mp3.h" +#include "sound/vorbis.h" + #define SB_HEADER_SIZE 110 #define STOP_MUSIC -1 @@ -190,7 +194,7 @@ void MP3Sound::sfxPlay(const char *name, bool isSpeech) { if (_vm->resource()->fileExists(name)) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playMP3(isSpeech ? &_speechHandle : &_sfxHandle, f, size); + _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size), false); } } #endif @@ -200,7 +204,7 @@ void OGGSound::sfxPlay(const char *name, bool isSpeech) { if (_vm->resource()->fileExists(name)) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playVorbis(isSpeech ? &_speechHandle : &_sfxHandle, f, size); + _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size), false); } } #endif @@ -210,7 +214,7 @@ void FLACSound::sfxPlay(const char *name, bool isSpeech) { if (_vm->resource()->fileExists(name)) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playFlac(isSpeech ? &_speechHandle : &_sfxHandle, f, size); + _mixer->playInputStream(isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size), false); } } #endif |