From f8e050fbc22b337a1854f1ee6c8f168dc925568c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 25 Jul 2009 14:09:58 +0000
Subject: Yet another fix for the GP2x backend.

svn-id: r42761
---
 backends/platform/gp2x/gp2x.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'backends/platform/gp2x/gp2x.cpp')

diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 15b5e19e5d..553385807a 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -34,6 +34,7 @@
 #include "common/archive.h"
 #include "common/config-manager.h"
 #include "common/debug.h"
+#include "common/EventRecorder.h"
 #include "common/events.h"
 #include "common/util.h"
 
@@ -318,7 +319,7 @@ OSystem_GP2X::~OSystem_GP2X() {
 
 uint32 OSystem_GP2X::getMillis() {
 	uint32 millis = SDL_GetTicks();
-	getEventManager()->processMillis(millis);
+	g_eventRec.processMillis(millis);
 	return millis;
 }
 
-- 
cgit v1.2.3


From 037c02a1f7179bbe5e3b044e6c9a13a94cd9851c Mon Sep 17 00:00:00 2001
From: John Willis
Date: Sat, 25 Jul 2009 19:07:28 +0000
Subject: GP2X Backend: Volume control code cleanup.

svn-id: r42785
---
 backends/platform/gp2x/gp2x.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'backends/platform/gp2x/gp2x.cpp')

diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 553385807a..4752646083 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -233,15 +233,16 @@ void OSystem_GP2X::initBackend() {
 		// switch. Still, it's a potential future change to keep in mind.
 		_timer = new DefaultTimerManager();
 		_timerID = SDL_AddTimer(10, &timer_handler, _timer);
+	}
+
+	/* Initialise any GP2X specific stuff we may want (Batt Status, scaler etc.) */
+	GP2X_HW::deviceInit();
 
-	// Initialise any GP2X specific stuff we may want (Volume, Batt Status etc.)
-	GP2X_device_init();
+	/* Set Default hardware mixer volume to a preset level (VOLUME_INITIAL). This is done to 'reset' volume level if set by other apps. */
+	GP2X_HW::mixerMoveVolume(0);
 
 	// Set Default hardware mixer volume to a plesent level.
 	// This is done to 'reset' volume level if set by other apps.
-	GP2X_mixer_set_volume(70, 70);
-
-	}
 
 	//if (SDL_GP2X_MouseType() == 0) {
 	//	// No mouse, F100 default state.
@@ -448,7 +449,7 @@ void OSystem_GP2X::quit() {
 	if (_joystick)
 		SDL_JoystickClose(_joystick);
 	//CloseRam();
-	GP2X_device_deinit();
+	GP2X_HW::deviceDeinit();
 
 	SDL_RemoveTimer(_timerID);
 	closeMixer();
-- 
cgit v1.2.3


From 972cbb4b579bb3767b118e666c761422e20b14b0 Mon Sep 17 00:00:00 2001
From: John Willis
Date: Tue, 28 Jul 2009 20:22:38 +0000
Subject: GP2XWiz: Add downscale support to the backend using the
 PocketPCHalfARM scaler from the WinCE backend (Maybe this should be moved
 into /graphics/scalers at some point?). Also enable all the ARM optemised
 routines in this and the GP2X backend.

svn-id: r42863
---
 backends/platform/gp2x/gp2x.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'backends/platform/gp2x/gp2x.cpp')

diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 4752646083..3d416f8415 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -448,7 +448,6 @@ void OSystem_GP2X::quit() {
 
 	if (_joystick)
 		SDL_JoystickClose(_joystick);
-	//CloseRam();
 	GP2X_HW::deviceDeinit();
 
 	SDL_RemoveTimer(_timerID);
-- 
cgit v1.2.3