diff options
| author | Johannes Schickel | 2010-01-06 00:01:27 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-06 00:01:27 +0000 |
| commit | 5243157eb10179b6fab3dd791cacc5cdd9b10396 (patch) | |
| tree | bf6e3828b7c0f0d0980c63e2e9d0cbd08e5aa4ec /engines | |
| parent | fb9017c51e22c0121dafa124fb59de603e4f11b1 (diff) | |
| download | scummvm-rg350-5243157eb10179b6fab3dd791cacc5cdd9b10396.tar.gz scummvm-rg350-5243157eb10179b6fab3dd791cacc5cdd9b10396.tar.bz2 scummvm-rg350-5243157eb10179b6fab3dd791cacc5cdd9b10396.zip | |
Adapt digital iMuse to use SeekableAudioStream::seek, instead of ryling on the deprecated FLAC, Vorbis and MP3 interface.
svn-id: r47064
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 7 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index bd722fe636..7b966943b8 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -704,17 +704,18 @@ int32 ImuseDigiSndMgr::getDataFromRegion(SoundDesc *soundDesc, int region, byte assert(tmp); #ifdef USE_FLAC if (soundMode == 3) - soundDesc->compressedStream = Audio::makeFlacStream(tmp, true, offsetMs, 0, 1); + soundDesc->compressedStream = Audio::makeFlacStream(tmp, true); #endif #ifdef USE_VORBIS if (soundMode == 2) - soundDesc->compressedStream = Audio::makeVorbisStream(tmp, true, offsetMs, 0, 1); + soundDesc->compressedStream = Audio::makeVorbisStream(tmp, true); #endif #ifdef USE_MAD if (soundMode == 1) - soundDesc->compressedStream = Audio::makeMP3Stream(tmp, true, offsetMs, 0, 1); + soundDesc->compressedStream = Audio::makeMP3Stream(tmp, true); #endif assert(soundDesc->compressedStream); + soundDesc->compressedStream->seek(offsetMs); } strcpy(soundDesc->lastFileName, fileName); } diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h index 099698b2a3..0a667eba9d 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.h +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h @@ -101,7 +101,7 @@ public: int type; int volGroupId; int disk; - Audio::AudioStream *compressedStream; + Audio::SeekableAudioStream *compressedStream; bool compressed; char lastFileName[24]; }; |