[Scummvm-cvs-logs] SF.net SVN: scummvm:[33098] scummvm/trunk/backends/platform/symbian/src/ SymbianOS.cpp

[anotherguest at users.sourceforge.net]

Revision: 33098
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33098&view=rev
Author:   anotherguest
Date:     2008-07-18 19:02:40 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Symbian soundsmixer update. (Compile fix)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-07-18 16:44:42 UTC (rev 33097)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-07-18 19:02:40 UTC (rev 33098)
@@ -33,7 +33,7 @@
 #include "gui/Actions.h"
 #include "gui/Key.h"
 #include "gui/message.h"
-
+#include "sound/mixer_intern.h"
 #include "..\..\sdl\main.cpp"
 
 #ifdef SAMPLES_PER_SEC_8000 // the GreanSymbianMMP format cannot handle values for defines :(
@@ -246,9 +246,9 @@
 	if (!this_->_mixer)
 		return;
 
-#ifdef S60
+#if defined (S60) && !defined(S60V3)
 	// If not stereo then we need to downmix
-	if (_channels != 2) {
+	if (this_->_mixer->_channels != 2) {
 		this_->_mixer->mixCallback(_stereo_mix_buffer, len * 2);
 
 		int16 *bitmixDst = (int16 *)samples;


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