From 6a13ef3f56a80ac698d463f5d00235ea2a090f52 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sun, 24 Aug 2008 13:26:57 +0000
Subject: [PATCH] final fixes for UIQ3

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@573 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 Pico/Draw.c                                | 2 +-
 platform/common/config.c                   | 3 ++-
 platform/uiq3/engine/audio_mediaserver.cpp | 6 ++++--
 platform/uiq3/engine/vid.cpp               | 5 ++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Pico/Draw.c b/Pico/Draw.c
index 215e9ec0..15d09927 100644
--- a/Pico/Draw.c
+++ b/Pico/Draw.c
@@ -1430,7 +1430,7 @@ static void PicoLine(void)
     FinalizeLine(sh);
 
   if (PicoScanEnd != NULL)
-    PicoScanEnd(DrawScanline);
+    skip_next_line = PicoScanEnd(DrawScanline);
 }
 
 void PicoDrawSync(int to, int blank_last_line)
diff --git a/platform/common/config.c b/platform/common/config.c
index a621893f..c530c957 100644
--- a/platform/common/config.c
+++ b/platform/common/config.c
@@ -729,7 +729,8 @@ static void keys_parse(const char *var, const char *val, int binds[32],
 		return;
 	}
 
-	if (binds == currentConfig.KeyBinds && !(keys_encountered & (1<<t))) { // hack
+	// unbind old, but only when key is first encountered
+	if (t < 32 && binds == currentConfig.KeyBinds && !(keys_encountered & (1<<t))) {
 		binds[t] = 0;
 		keys_encountered |= 1<<t;
 	}
diff --git a/platform/uiq3/engine/audio_mediaserver.cpp b/platform/uiq3/engine/audio_mediaserver.cpp
index c9788d3c..e9f77d07 100644
--- a/platform/uiq3/engine/audio_mediaserver.cpp
+++ b/platform/uiq3/engine/audio_mediaserver.cpp
@@ -95,8 +95,10 @@ void CGameAudioMS::ConstructL()
 	iBufferSize *= bufferedFrames;
 	for (TInt i=0 ; i<KSoundBuffers ; i++)
 	{
-		iSoundBuffers[i] = HBufC8::NewL(iBufferSize);
-		iSoundBuffers[i]->Des().FillZ  (iBufferSize);
+		// it seems .SetLength(max) throws USER:23 panic,
+		// so make them a bit larger
+		iSoundBuffers[i] = HBufC8::NewL(iBufferSize+4);
+		iSoundBuffers[i]->Des().FillZ  (iBufferSize+4);
 	}
 
 	iCurrentBuffer = 0;
diff --git a/platform/uiq3/engine/vid.cpp b/platform/uiq3/engine/vid.cpp
index ea3cf9b1..d21e8546 100644
--- a/platform/uiq3/engine/vid.cpp
+++ b/platform/uiq3/engine/vid.cpp
@@ -321,7 +321,7 @@ static void vidBlitCenter_180(int full)
 static void vidBlitFit_0(int full)
 {
 	if(Pico.video.reg[12]&1)
-		 vidConvCpy_center2_40c_0(screenbuff, PicoDraw2FB+328*8, localPal, 168);
+	     vidConvCpy_center2_40c_0(screenbuff, PicoDraw2FB+328*8, localPal, 168);
 	else vidConvCpy_center2_32c_0(screenbuff, PicoDraw2FB+328*8, localPal, 168);
 	if(full) vidClear((unsigned long *)screenbuff + 168*256, 320-168);
 }
@@ -389,6 +389,7 @@ int vidInit(void *vidmem, int reinit)
 	// select suitable blitters
 	vidBlit = vidBlit_270;
 	PicoScanBegin = EmuScanBegin8;
+	PicoScanEnd = NULL;
 	drawTextFps = drawTextFps0;
 	drawTextNotice = drawTextNotice0;
 
@@ -411,6 +412,7 @@ int vidInit(void *vidmem, int reinit)
 			vidBlit = vidBlitFit_0;
 			drawTextFps = drawTextFpsFit0;
 			drawTextNotice = drawTextNoticeFit0;
+			PicoScanBegin = NULL;
 			PicoScanEnd = EmuScanEndFit0;
 		}
 	} else if (currentConfig.rotation == TPicoConfig::PRot90) {
@@ -432,6 +434,7 @@ int vidInit(void *vidmem, int reinit)
 			vidBlit = vidBlitFit_180;
 			drawTextFps = drawTextFpsFit0;
 			drawTextNotice = drawTextNoticeFit0;
+			PicoScanBegin = NULL;
 			PicoScanEnd = EmuScanEndFit0;
 		}
 	}
-- 
2.39.5