From 5243157eb10179b6fab3dd791cacc5cdd9b10396 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 6 Jan 2010 00:01:27 +0000
Subject: Adapt digital iMuse to use SeekableAudioStream::seek, instead of
 ryling on the deprecated FLAC, Vorbis and MP3 interface.

svn-id: r47064
---
 engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 7 ++++---
 engines/scumm/imuse_digi/dimuse_sndmgr.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines')

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];
 	};
-- 
cgit v1.2.3