[Scummvm-cvs-logs] scummvm master -> a8049f708b023c887bd8a8792b68299c7050dca9

[fuzzie]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a8049f708b BACKENDS: Mono output devices are OK on Symbian.


Commit: a8049f708b023c887bd8a8792b68299c7050dca9
    https://github.com/scummvm/scummvm/commit/a8049f708b023c887bd8a8792b68299c7050dca9
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-06-17T10:47:32-07:00

Commit Message:
BACKENDS: Mono output devices are OK on Symbian.

Changed paths:
    backends/mixer/sdl/sdl-mixer.cpp



diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index f0b0885..979b18e 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -84,8 +84,12 @@ void SdlMixerManager::init() {
 		if (_obtained.format != desired.format)
 			warning("SDL mixer sound format: %d differs from desired: %d", _obtained.format, desired.format);
 
+#ifndef __SYMBIAN32__
+		// The SymbianSdlMixerManager does stereo->mono downmixing,
+		// but otherwise we require stereo output.
 		if (_obtained.channels != 2)
 			error("SDL mixer output requires stereo output device");
+#endif
 
 		_mixer = new Audio::MixerImpl(g_system, _obtained.freq);
 		assert(_mixer);