[Scummvm-cvs-logs] SF.net SVN: scummvm: [26196] scummvm/trunk/engines/sword2/music.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sun Mar 18 10:33:43 CET 2007
Revision: 26196
http://scummvm.svn.sourceforge.net/scummvm/?rev=26196&view=rev
Author: eriktorbjorn
Date: 2007-03-18 02:33:42 -0700 (Sun, 18 Mar 2007)
Log Message:
-----------
Fixed bug that caused the music to stop. I don't know if this is a regression,
or it if was just luck that it worked before.
Modified Paths:
--------------
scummvm/trunk/engines/sword2/music.cpp
Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp 2007-03-18 09:16:12 UTC (rev 26195)
+++ scummvm/trunk/engines/sword2/music.cpp 2007-03-18 09:33:42 UTC (rev 26196)
@@ -264,6 +264,7 @@
MusicInputStream::~MusicInputStream() {
delete _decoder;
+ _decoder = NULL;
}
int MusicInputStream::readBuffer(int16 *buffer, const int numSamples) {
@@ -471,12 +472,8 @@
}
bool Sound::endOfData() const {
- for (int i = 0; i < MAXMUS; i++) {
- if (_musicFile[i].file.isOpen())
- return false;
- }
-
- return true;
+ // The music never stops. It just goes quiet.
+ return false;
}
// ----------------------------------------------------------------------------
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