diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/saga/sound.h | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/saga/sound.h')
| -rw-r--r-- | engines/saga/sound.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/engines/saga/sound.h b/engines/saga/sound.h index 15624a9da5..e2163dfb0e 100644 --- a/engines/saga/sound.h +++ b/engines/saga/sound.h @@ -27,9 +27,11 @@ #include "common/file.h" #include "audio/mixer.h" -#include "audio/decoders/mp3.h" -#include "audio/decoders/vorbis.h" -#include "audio/decoders/flac.h" +#include "audio/timestamp.h" + +namespace Audio { +class RewindableAudioStream; +} namespace Saga { @@ -40,15 +42,8 @@ enum SOUND_FLAGS { }; struct SoundBuffer { - uint16 frequency; - bool isCompressed; - byte flags; - - byte *buffer; - size_t size; - size_t originalSize; - GameSoundTypes soundType; - size_t fileOffset; + Audio::RewindableAudioStream *stream; + Audio::Timestamp streamLength; }; enum sndHandleType { |