[Scummvm-cvs-logs] SF.net SVN: scummvm:[49600] scummvm/branches/gsoc2010-opengl/backends/ platform/sdl

[vgvgf at users.sourceforge.net]

Revision: 49600
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49600&view=rev
Author:   vgvgf
Date:     2010-06-11 23:04:57 +0000 (Fri, 11 Jun 2010)

Log Message:
-----------
Fixed compilation error on Mac.

Modified Paths:
--------------
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp
    scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp	2010-06-11 19:49:41 UTC (rev 49599)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.cpp	2010-06-11 23:04:57 UTC (rev 49600)
@@ -457,7 +457,7 @@
 
 		// Generate samples and put them into the next buffer
 		nextSoundBuffer = _activeSoundBuf ^ 1;
-		_mixer->mixCallback(_soundBuffers[nextSoundBuffer], _soundBufSize);
+		((Audio::MixerImpl *)_mixer)->mixCallback(_soundBuffers[nextSoundBuffer], _soundBufSize);
 
 		// Swap buffers
 		_activeSoundBuf = nextSoundBuffer;
@@ -473,7 +473,7 @@
 }
 
 
-void OSystem_SDL::initThreadedMixer(Audio::MixerImpl *mixer, uint bufSize) {
+void OSystem_SDL::initThreadedMixer(Audio::Mixer *mixer, uint bufSize) {
 	_soundThreadIsRunning = false;
 	_soundThreadShouldQuit = false;
 

Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h	2010-06-11 19:49:41 UTC (rev 49599)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/sdl.h	2010-06-11 23:04:57 UTC (rev 49600)
@@ -147,7 +147,7 @@
 
 	void mixerProducerThread();
 	static int SDLCALL mixerProducerThreadEntry(void *arg);
-	void initThreadedMixer(Audio::MixerImpl *mixer, uint bufSize);
+	void initThreadedMixer(Audio::Mixer *mixer, uint bufSize);
 	void deinitThreadedMixer();
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.