From ee755f540e74e54a5c28841ef73ffb55427c47a3 Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@feb19cf6-d755-11dd-8179-53c65a4d6d95>
Date: Wed, 7 Jan 2009 17:22:45 +0000
Subject: [PATCH] Corrected sound buf size, more key codes

---
 Src/C64_SDL.i | 19 ++++++++++++++++++-
 Src/gcaudio.c |  2 +-
 meta.xml      |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Src/C64_SDL.i b/Src/C64_SDL.i
index 4162d06..02eb988 100644
--- a/Src/C64_SDL.i
+++ b/Src/C64_SDL.i
@@ -208,6 +208,19 @@ void C64::select_disc(Prefs *np)
         free(file_list);
 }
 
+/*
+  C64 keyboard matrix:
+
+    Bit 7   6   5   4   3   2   1   0
+  0    CUD  F5  F3  F1  F7 CLR RET DEL
+  1    SHL  E   S   Z   4   A   W   3
+  2     X   T   F   C   6   D   R   5
+  3     V   U   H   B   8   G   Y   7
+  4     N   O   K   M   0   J   I   9
+  5     ,   @   :   .   -   L   P   +
+  6     /   ^   =  SHR HOM  ;   *   �
+  7    R/S  Q   C= SPC  2  CTL  <-  1
+*/
 #define MATRIX(a,b) (((a) << 3) | (b))
 
 void C64::bind_key(Prefs *np)
@@ -218,6 +231,7 @@ void C64::bind_key(Prefs *np)
         		"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A",
         		"B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
         		"N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
+        		"ctrl", "del", "home,", "shl", "shr", "clr", "C=", "<-",
         		NULL };
         int kcs[] = { MATRIX(7, 4), MATRIX(7, 7), MATRIX(0, 1), /* space, R/S, return */
         	MATRIX(0, 4), MATRIX(0, 5), MATRIX(0, 6), MATRIX(0, 3), MATRIX(4, 3), MATRIX(7, 0),
@@ -226,7 +240,10 @@ void C64::bind_key(Prefs *np)
         	MATRIX(1, 6), MATRIX(2, 5), MATRIX(3, 2), MATRIX(3, 5), MATRIX(4, 1), MATRIX(4, 2),
         	MATRIX(4, 5), MATRIX(5, 2), MATRIX(4, 4), MATRIX(4, 7), MATRIX(4, 6), MATRIX(5, 1),
         	MATRIX(7, 6), MATRIX(2, 1), MATRIX(1, 5), MATRIX(2, 6), MATRIX(3, 6), MATRIX(3, 7),
-        	MATRIX(1, 1), MATRIX(2, 7), MATRIX(3, 1), MATRIX(1, 4) };
+        	MATRIX(1, 1), MATRIX(2, 7), MATRIX(3, 1), MATRIX(1, 4), /* ... Z */
+        	MATRIX(7, 3), MATRIX(0, 0), MATRIX(6, 4), MATRIX(1, 7), MATRIX(6, 4),
+        	MATRIX(0, 2), MATRIX(7, 5), MATRIX(7, 1),
+        	};
 
         menu_init(&bind_key_menu, this->menu_font, bind_key_messages,
 			0, 32, MENU_SIZE_X, MENU_SIZE_Y);
diff --git a/Src/gcaudio.c b/Src/gcaudio.c
index 8f92172..5cd945e 100644
--- a/Src/gcaudio.c
+++ b/Src/gcaudio.c
@@ -19,7 +19,7 @@
 #define MIXBUFSIZE_SHORT (MIXBUFSIZE_BYTES / 2)
 #define MIXBUFSIZE_WORDS (MIXBUFSIZE_BYTES / 4)
 
-#define SOUNDBUFSIZE 512
+#define SOUNDBUFSIZE 2048
 
 static u8 ConfigRequested = 0;
 static u8 soundbuffer[2][SOUNDBUFSIZE] ATTRIBUTE_ALIGN(32);
diff --git a/meta.xml b/meta.xml
index d463585..cd30a09 100644
--- a/meta.xml
+++ b/meta.xml
@@ -2,7 +2,7 @@
   <app version="1">
     <name>Frodo</name>
     <coder>Simon Kagstrom</coder>
-    <version>1</version>
+    <version>2</version>
     <release_date>20090107</release_date>
     <short_description>Commodore 64 emulator</short_description>
     <long_description>Frodo is a C64 emulator written by Christian Bauer. It supports C64 disk and tape images in the .d64 and .t64 formats. The port to Wii was done by Simon Kagstrom.</long_description>