diff options
| author | Max Horn | 2004-02-22 14:11:16 +0000 |
|---|---|---|
| committer | Max Horn | 2004-02-22 14:11:16 +0000 |
| commit | aa6ec62e9db78db12912d0e48025241c5d7ef4f7 (patch) | |
| tree | 0afae2b795f07b9bd1c00dc75af3dca3864dac5f /sound/mixer.cpp | |
| parent | 6db3a8819e7ef847f6aefac8e40f542cad006481 (diff) | |
| download | scummvm-rg350-aa6ec62e9db78db12912d0e48025241c5d7ef4f7.tar.gz scummvm-rg350-aa6ec62e9db78db12912d0e48025241c5d7ef4f7.tar.bz2 scummvm-rg350-aa6ec62e9db78db12912d0e48025241c5d7ef4f7.zip | |
Patch #885904 (Flac Support) with some tweaks by me
svn-id: r12984
Diffstat (limited to 'sound/mixer.cpp')
| -rw-r--r-- | sound/mixer.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index af3bbc3156..c7260ee02e 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -29,6 +29,7 @@ #include "sound/audiostream.h" #include "sound/mp3.h" #include "sound/vorbis.h" +#include "sound/flac.h" #pragma mark - @@ -269,6 +270,14 @@ void SoundMixer::playVorbis(PlayingSoundHandle *handle, File *file, uint32 size, } #endif +#ifdef USE_FLAC +void SoundMixer::playFlac(PlayingSoundHandle *handle, File *file, uint32 size, byte volume, int8 balance, int id) { + // Create the input stream + AudioStream *input = makeFlacStream(file, size); + playInputStream(handle, input, false, volume, balance, id); +} +#endif + void SoundMixer::playInputStream(PlayingSoundHandle *handle, AudioStream *input, bool isMusic, byte volume, int8 balance, int id, bool autofreeStream) { Common::StackLock lock(_mutex); |