[Scummvm-cvs-logs] SF.net SVN: scummvm: [24583] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Nov 1 22:28:24 CET 2006
Revision: 24583
http://svn.sourceforge.net/scummvm/?rev=24583&view=rev
Author: fingolfin
Date: 2006-11-01 13:28:14 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
Added Audio::Mixer::setReady method to work around bug #1588848
Modified Paths:
--------------
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/sound/mixer.h
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2006-11-01 21:09:25 UTC (rev 24582)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2006-11-01 21:28:14 UTC (rev 24583)
@@ -190,7 +190,8 @@
// allow subclasses to provide their own).
if (_mixer == 0) {
_mixer = new Audio::Mixer();
- setSoundCallback(Audio::Mixer::mixCallback, _mixer);
+ bool result = setSoundCallback(Audio::Mixer::mixCallback, _mixer);
+ _mixer->setReady(result);
}
// Create and hook up the timer manager, if none exists yet (we check for
Modified: scummvm/trunk/sound/mixer.h
===================================================================
--- scummvm/trunk/sound/mixer.h 2006-11-01 21:09:25 UTC (rev 24582)
+++ scummvm/trunk/sound/mixer.h 2006-11-01 21:28:14 UTC (rev 24583)
@@ -308,6 +308,8 @@
* This simply calls the mix() method.
*/
static void mixCallback(void *s, byte *samples, int len);
+
+ void setReady(bool ready) { _mixerReady = ready; }
};
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