X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=482b9cdff9e8176d7f309c3edef04c9882a64f7c;hb=b4975cbd28c54b5a8f5d7a119375fe05b46f19a1;hp=3c93d03a8a62ce02a06b87e12372d8f0520c2639;hpb=69effddb777c2009d32f70e3315d5570973446ef;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index 3c93d03..482b9cd 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -439,6 +439,11 @@ void MainWin::keyPressEvent(QKeyEvent * e)
 {
 	// From jaguar.cpp
 	extern bool startM68KTracing;
+	// From joystick.cpp
+	extern int blit_start_log;
+	// From blitter.cpp
+	extern bool startConciseBlitLogging;
+
 
 	// We ignore the Alt key for now, since it causes problems with the GUI
 	if (e->key() == Qt::Key_Alt)
@@ -452,8 +457,37 @@ void MainWin::keyPressEvent(QKeyEvent * e)
 		e->accept();
 		return;
 	}
+	else if (e->key() == Qt::Key_F12)
+	{
+		blit_start_log = true;
+		e->accept();
+		return;
+	}
+	else if (e->key() == Qt::Key_F10)
+	{
+		startConciseBlitLogging = true;
+		e->accept();
+		return;
+	}
+	else if (e->key() == Qt::Key_F8)
+	{
+		// ggn: For extra NYAN pleasure...
+		// ggn: There you go James :P
+		// Shamus: Thanks for the patch! :-D
+		WriteLog("    o  +           +        +\n");
+		WriteLog("+        o     o       +        o\n");
+		WriteLog("-_-_-_-_-_-_-_,------,      o \n");
+		WriteLog("_-_-_-_-_-_-_-|   /\\_/\\  \n");
+		WriteLog("-_-_-_-_-_-_-~|__( ^ .^)  +     +  \n");
+		WriteLog("_-_-_-_-_-_-_-\"\"  \"\"      \n");
+		WriteLog("+      o         o   +       o\n");
+		WriteLog("    +         +\n");
+		e->accept();
+		return;
+	}
 
 /*
+This is done now by a QAction...
 	if (e->key() == Qt::Key_F9)
 	{
 		ToggleFullScreen();
@@ -1090,7 +1124,7 @@ void MainWin::ReadSettings(void)
 	vjs.frameSkip        = settings.value("frameSkip", 0).toInt();
 	vjs.useJaguarBIOS    = settings.value("useJaguarBIOS", false).toBool();
 	vjs.GPUEnabled       = settings.value("GPUEnabled", true).toBool();
-	vjs.DSPEnabled       = settings.value("DSPEnabled", false).toBool();
+	vjs.DSPEnabled       = settings.value("DSPEnabled", true).toBool();
 	vjs.audioEnabled     = settings.value("audioEnabled", true).toBool();
 	vjs.usePipelinedDSP  = settings.value("usePipelinedDSP", false).toBool();
 	vjs.fullscreen       = settings.value("fullscreen", false).toBool();
@@ -1099,6 +1133,7 @@ void MainWin::ReadSettings(void)
 	vjs.renderType       = settings.value("renderType", 0).toInt();
 	vjs.allowWritesToROM = settings.value("writeROM", false).toBool();
 	vjs.biosType         = settings.value("biosType", BT_M_SERIES).toInt();
+	vjs.useFastBlitter   = settings.value("useFastBlitter", false).toBool();
 	strcpy(vjs.EEPROMPath, settings.value("EEPROMs", "./eeproms/").toString().toAscii().data());
 	strcpy(vjs.ROMPath, settings.value("ROMs", "./software/").toString().toAscii().data());
 	strcpy(vjs.alpineROMPath, settings.value("DefaultROM", "").toString().toAscii().data());
@@ -1186,6 +1221,7 @@ void MainWin::WriteSettings(void)
 	settings.setValue("renderType", vjs.renderType);
 	settings.setValue("writeROM", vjs.allowWritesToROM);
 	settings.setValue("biosType", vjs.biosType);
+	settings.setValue("useFastBlitter", vjs.useFastBlitter);
 	settings.setValue("JagBootROM", vjs.jagBootPath);
 	settings.setValue("CDBootROM", vjs.CDBootPath);
 	settings.setValue("EEPROMs", vjs.EEPROMPath);