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

[fingolfin]

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

Summary:
c37f36d0a8 GPH: Replace defunct MIXER_DOUBLE_BUFFERING by working code
b49f313dd4 OPENPANDORA: Replace defunct MIXER_DOUBLE_BUFFERING by working code


Commit: c37f36d0a87917a72afd860a960f8c83f8d0552d
    https://github.com/scummvm/scummvm/commit/c37f36d0a87917a72afd860a960f8c83f8d0552d
Author: Max Horn (max at quendi.de)
Date: 2011-04-19T06:09:50-07:00

Commit Message:
GPH: Replace defunct MIXER_DOUBLE_BUFFERING by working code

Changed paths:
    backends/platform/gph/gph-backend.cpp
    backends/platform/gph/gph-sdl.h



diff --git a/backends/platform/gph/gph-backend.cpp b/backends/platform/gph/gph-backend.cpp
index 0432974..fddcd03 100644
--- a/backends/platform/gph/gph-backend.cpp
+++ b/backends/platform/gph/gph-backend.cpp
@@ -26,23 +26,22 @@
 #include "backends/platform/sdl/sdl-sys.h"
 
 // #include "backends/platform/gph/gph-options.h"
-#include "backends/platform/gph/gph-sdl.h"
+#include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h"
 #include "backends/platform/gph/gph-hw.h"
+#include "backends/platform/gph/gph-sdl.h"
 #include "backends/plugins/posix/posix-provider.h"
+#include "backends/saves/default/default-saves.h"
+#include "backends/timer/default/default-timer.h"
+
 #include "base/main.h"
 
 #include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/events.h"
-#include "common/util.h"
-
 #include "common/file.h"
-#include "base/main.h"
-
-#include "backends/saves/default/default-saves.h"
+#include "common/util.h"
 
-#include "backends/timer/default/default-timer.h"
 #include "audio/mixer_intern.h"
 
 #include <stdio.h>
@@ -67,6 +66,14 @@ void OSystem_GPH::initBackend() {
 		_graphicsManager = new GPHGraphicsManager(_eventSource);
 	}
 
+	// Create the mixer manager
+	if (_mixer == 0) {
+		_mixerManager = new DoubleBufferSDLMixerManager();
+
+		// Setup and start mixer
+		_mixerManager->init();
+	}
+
 	/* Setup default save path to be workingdir/saves */
 
 	char savePath[PATH_MAX+1];
diff --git a/backends/platform/gph/gph-sdl.h b/backends/platform/gph/gph-sdl.h
index 51c609d2..68a641e 100644
--- a/backends/platform/gph/gph-sdl.h
+++ b/backends/platform/gph/gph-sdl.h
@@ -32,7 +32,6 @@
 #include "backends/events/gph/gph-events.h"
 
 #define __GP2XWIZ__
-#define MIXER_DOUBLE_BUFFERING 1
 
 #ifndef PATH_MAX
 	#define PATH_MAX 255


Commit: b49f313dd4c735d4598441584ec0d8dca0b5489c
    https://github.com/scummvm/scummvm/commit/b49f313dd4c735d4598441584ec0d8dca0b5489c
Author: Max Horn (max at quendi.de)
Date: 2011-04-19T06:09:50-07:00

Commit Message:
OPENPANDORA: Replace defunct MIXER_DOUBLE_BUFFERING by working code

Changed paths:
    backends/platform/openpandora/op-backend.cpp
    backends/platform/openpandora/op-sdl.h



diff --git a/backends/platform/openpandora/op-backend.cpp b/backends/platform/openpandora/op-backend.cpp
index 5b33392..4c29636 100644
--- a/backends/platform/openpandora/op-backend.cpp
+++ b/backends/platform/openpandora/op-backend.cpp
@@ -26,20 +26,17 @@
 #include "backends/platform/openpandora/op-sdl.h"
 #include "base/main.h"
 
+#include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h"
 #include "backends/saves/default/default-saves.h"
+#include "backends/timer/default/default-timer.h"
 
 #include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
 #include "common/events.h"
-#include "common/util.h"
-
 #include "common/file.h"
-#include "base/main.h"
-
-#include "backends/saves/default/default-saves.h"
+#include "common/util.h"
 
-#include "backends/timer/default/default-timer.h"
 #include "audio/mixer_intern.h"
 
 #include <stdio.h>
@@ -78,6 +75,14 @@ void OSystem_OP::initBackend() {
 //	}
 //
 
+	// Create the mixer manager
+	if (_mixer == 0) {
+		_mixerManager = new DoubleBufferSDLMixerManager();
+
+		// Setup and start mixer
+		_mixerManager->init();
+	}
+
 	/* Setup default save path to be workingdir/saves */
 
 	char savePath[PATH_MAX+1];
diff --git a/backends/platform/openpandora/op-sdl.h b/backends/platform/openpandora/op-sdl.h
index 93c82ca..9d92472 100644
--- a/backends/platform/openpandora/op-sdl.h
+++ b/backends/platform/openpandora/op-sdl.h
@@ -32,7 +32,6 @@
 #include "backends/graphics/openpandora/op-graphics.h"
 
 #define __OPENPANDORA__
-#define MIXER_DOUBLE_BUFFERING 1
 
 #ifndef PATH_MAX
 	#define PATH_MAX 255