aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/symbian/src/SymbianOS.cpp
diff options
context:
space:
mode:
authorLars Persson2008-07-18 19:02:40 +0000
committerLars Persson2008-07-18 19:02:40 +0000
commit7b00db03123ae6a4761d0fc42bac0a5be6b4ad28 (patch)
tree2d484021039c5ddfb054ef6ce1c514c5bb25a324 /backends/platform/symbian/src/SymbianOS.cpp
parent8757326b5f2b464ddc6cc2b523f573c31a191ad3 (diff)
downloadscummvm-rg350-7b00db03123ae6a4761d0fc42bac0a5be6b4ad28.tar.gz
scummvm-rg350-7b00db03123ae6a4761d0fc42bac0a5be6b4ad28.tar.bz2
scummvm-rg350-7b00db03123ae6a4761d0fc42bac0a5be6b4ad28.zip
Symbian soundsmixer update. (Compile fix)
svn-id: r33098
Diffstat (limited to 'backends/platform/symbian/src/SymbianOS.cpp')
-rw-r--r--backends/platform/symbian/src/SymbianOS.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index dfeb24d825..9e0b8d7c22 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -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 @@ void OSystem_SDL_Symbian::symbianMixCallback(void *sys, byte *samples, int len)
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;