[openMSX-commits] CVS: openMSX/src DACSound.hh,1.6,1.7 Keyboard.cc,1.6,1.7

[Wouter V. <m97...@us...>]

Update of /cvsroot/openmsx/openMSX/src
In directory usw-pr-cvs1:/tmp/cvs-serv7275/src

Modified Files:
	DACSound.hh Keyboard.cc 
Log Message:
Keyboard updates


Index: DACSound.hh
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/DACSound.hh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DACSound.hh	2001/10/27 13:03:12	1.6
+++ DACSound.hh	2001/11/16 12:46:02	1.7
@@ -29,7 +29,7 @@
 	private:
 		void insertSamples(int nbSamples, short sample);
 		
-		static const int BUFSIZE = 256;
+		static const int BUFSIZE = 1024;
 		static const int CENTER = 0x80;
 	
 		MSXRealTime* realtime;

Index: Keyboard.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/Keyboard.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Keyboard.cc	2001/11/16 11:34:08	1.6
+++ Keyboard.cc	2001/11/16 12:46:02	1.7
@@ -7,10 +7,8 @@
 Keyboard::Keyboard(bool keyG)
 {
 	keyGhosting = keyG;
-	for (int i=0; i<NR_KEYROWS; i++) {
-		keyMatrix [i] = 255;
-		keyMatrix2[i] = 255;
-	}
+	memset(keyMatrix , 255, sizeof(keyMatrix) );
+	memset(keyMatrix2, 255, sizeof(keyMatrix2));
 	EventDistributor::instance()->registerSyncListener(SDL_KEYDOWN, this);
 	EventDistributor::instance()->registerSyncListener(SDL_KEYUP,   this);
 }
@@ -23,17 +21,17 @@
 const byte* Keyboard::getKeys()
 {
 	EventDistributor::instance()->pollSyncEvents();
-	if (keysChanged) {
-		keysChanged = false;
-		// memcpy((void*)&keyMatrix2[0], (void*)&keyMatrix[0], NR_KEYROWS*sizeof(byte)); -> instead of next 2 lines?
-		for (int i=0; i<NR_KEYROWS; i++) 
-			keyMatrix2[i] = keyMatrix[i];	// Copy matrix -> matrix2
-		if (keyGhosting)
-			doKeyGhosting();	// works on matrix2
-		for (int i=0; i<NR_KEYROWS; i++)
-		PRT_DEBUG("Keymatrix row " << i << ": " << (int)keyMatrix2[i]);
+
+	if (!keyGhosting) {
+		return keyMatrix;
+	} else {
+		if (keysChanged) {
+			keysChanged = false;
+			memcpy(keyMatrix2, keyMatrix, sizeof(keyMatrix));
+			doKeyGhosting();
+		}
+		return keyMatrix2;
 	}
-	return keyMatrix2;
 }