[Scummvm-cvs-logs] SF.net SVN: scummvm:[47064] scummvm/trunk/engines/scumm/imuse_digi
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Jan 6 01:01:28 CET 2010
Revision: 47064
http://scummvm.svn.sourceforge.net/scummvm/?rev=47064&view=rev
Author: lordhoto
Date: 2010-01-06 00:01:27 +0000 (Wed, 06 Jan 2010)
Log Message:
-----------
Adapt digital iMuse to use SeekableAudioStream::seek, instead of ryling on the deprecated FLAC, Vorbis and MP3 interface.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp 2010-01-06 00:00:50 UTC (rev 47063)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp 2010-01-06 00:01:27 UTC (rev 47064)
@@ -704,17 +704,18 @@
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);
}
Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h 2010-01-06 00:00:50 UTC (rev 47063)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.h 2010-01-06 00:01:27 UTC (rev 47064)
@@ -101,7 +101,7 @@
int type;
int volGroupId;
int disk;
- Audio::AudioStream *compressedStream;
+ Audio::SeekableAudioStream *compressedStream;
bool compressed;
char lastFileName[24];
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list