[Scummvm-cvs-logs] SF.net SVN: scummvm: [32265] scummvm/trunk/sound
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun May 25 01:58:22 CEST 2008
Revision: 32265
http://scummvm.svn.sourceforge.net/scummvm/?rev=32265&view=rev
Author: lordhoto
Date: 2008-05-24 16:58:22 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Instead of simply returning 0 for "infinite" looping in FLAC and OGG/Vorbis streams in getTotalPlayTime return kUnknownPlayTime.
Modified Paths:
--------------
scummvm/trunk/sound/flac.cpp
scummvm/trunk/sound/vorbis.cpp
Modified: scummvm/trunk/sound/flac.cpp
===================================================================
--- scummvm/trunk/sound/flac.cpp 2008-05-24 23:49:15 UTC (rev 32264)
+++ scummvm/trunk/sound/flac.cpp 2008-05-24 23:58:22 UTC (rev 32265)
@@ -143,6 +143,9 @@
}
int32 getTotalPlayTime() const {
+ if (!_totalNumLoops)
+ return AudioStream::kUnknownPlayTime;
+
int32 samples = 0;
if (!_lastSample) {
Modified: scummvm/trunk/sound/vorbis.cpp
===================================================================
--- scummvm/trunk/sound/vorbis.cpp 2008-05-24 23:49:15 UTC (rev 32264)
+++ scummvm/trunk/sound/vorbis.cpp 2008-05-24 23:58:22 UTC (rev 32265)
@@ -120,6 +120,9 @@
int getRate() const { return _rate; }
int32 getTotalPlayTime() const {
+ if (!_totalNumLoops)
+ return AudioStream::kUnknownPlayTime;
+
#ifdef USE_TREMOR
return (_endTime - _startTime) * _totalNumLoops;
#else
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