X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fmainwin.cpp;h=3c93d03a8a62ce02a06b87e12372d8f0520c2639;hb=d1e404e2f488610a99f844783dca15a7525c3813;hp=ba2c0dd2c4682025b5ac549581724e8f87d9939d;hpb=19e894a3a9d9aeb0fbb3bf10ead34bed35f15a05;p=virtualjaguar

diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp
index ba2c0dd..3c93d03 100644
--- a/src/gui/mainwin.cpp
+++ b/src/gui/mainwin.cpp
@@ -38,11 +38,13 @@
 #include "app.h"
 #include "about.h"
 #include "configdialog.h"
+#include "controllertab.h"
 #include "filepicker.h"
 #include "gamepad.h"
 #include "generaltab.h"
 #include "glwidget.h"
 #include "help.h"
+#include "profile.h"
 #include "settings.h"
 #include "version.h"
 #include "debug/cpubrowser.h"
@@ -564,7 +566,10 @@ void MainWin::HandleGamepads(void)
 	{
 		if (vjs.p1KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
 			joypad0Buttons[i] = (Gamepad::GetState(0, vjs.p1KeyBindings[i]) ? 0x01 : 0x00);
-
+/*{
+if (vjs.p1KeyBindings[i] & JOY_AXIS)
+	printf("Axis state (HandleGamepads): %i\n", joypad0Buttons[i]);
+}*/
 		if (vjs.p2KeyBindings[i] & (JOY_BUTTON | JOY_HAT | JOY_AXIS))
 			joypad1Buttons[i] = (Gamepad::GetState(1, vjs.p2KeyBindings[i]) ? 0x01 : 0x00);
 	}
@@ -582,6 +587,8 @@ void MainWin::Configure(void)
 	ConfigDialog dlg(this);
 	//ick.
 	dlg.generalTab->useUnknownSoftware->setChecked(allowUnknownSoftware);
+	dlg.controllerTab1->profileNum = lastEditedProfile;
+	dlg.controllerTab1->SetupLastUsedProfile();
 
 	if (dlg.exec() == false)
 		return;
@@ -601,6 +608,7 @@ void MainWin::Configure(void)
 	bool allowOld = allowUnknownSoftware;
 	//ick.
 	allowUnknownSoftware = dlg.generalTab->useUnknownSoftware->isChecked();
+	lastEditedProfile = dlg.controllerTab1->profileNum;
 
 	// We rescan the "software" folder if the user either changed the path or
 	// checked/unchecked the "Allow unknown files" option in the config dialog.
@@ -681,13 +689,14 @@ void MainWin::Timer(void)
 
 	videoWidget->updateGL();
 
-#if 1
 	// FPS handling
-	// Approach: We use a ring buffer to store timestamps over a given amount
-	// of frames, then sum them to figure out the FPS.
+	// Approach: We use a ring buffer to store times (in ms) over a given
+	// amount of frames, then sum them to figure out the FPS.
 	uint32_t timestamp = SDL_GetTicks();
 	// This assumes the ring buffer size is a power of 2
-	ringBufferPointer = (ringBufferPointer + 1) & (RING_BUFFER_SIZE - 1);
+//	ringBufferPointer = (ringBufferPointer + 1) & (RING_BUFFER_SIZE - 1);
+	// Doing it this way is better. Ring buffer size can be arbitrary then.
+	ringBufferPointer = (ringBufferPointer + 1) % RING_BUFFER_SIZE;
 	ringBuffer[ringBufferPointer] = timestamp - oldTimestamp;
 	uint32_t elapsedTime = 0;
 
@@ -698,18 +707,14 @@ void MainWin::Timer(void)
 	if (elapsedTime == 0)
 		elapsedTime = 1;
 
-#if 0
-	float framesPerSecond = ((float)RING_BUFFER_SIZE / (float)elapsedTime) * 1000.0;
-	statusBar()->showMessage(QString("%1 FPS").arg(framesPerSecond));
-#else
 	// This is in frames per 10 seconds, so we can have 1 decimal
 	uint32_t framesPerSecond = (uint32_t)(((float)RING_BUFFER_SIZE / (float)elapsedTime) * 10000.0);
 	uint32_t fpsIntegerPart = framesPerSecond / 10;
 	uint32_t fpsDecimalPart = framesPerSecond % 10;
+	// If this is updated too frequently to be useful, we can throttle it down
+	// so that it only updates every 10th frame or so
 	statusBar()->showMessage(QString("%1.%2 FPS").arg(fpsIntegerPart).arg(fpsDecimalPart));
-#endif
 	oldTimestamp = timestamp;
-#endif
 }
 
 
@@ -1077,6 +1082,7 @@ void MainWin::ReadSettings(void)
 
 	zoomLevel = settings.value("zoom", 2).toInt();
 	allowUnknownSoftware = settings.value("showUnknownSoftware", false).toBool();
+	lastEditedProfile = settings.value("lastEditedProfile", 0).toInt();
 
 	vjs.useJoystick      = settings.value("useJoystick", false).toBool();
 	vjs.joyport          = settings.value("joyport", 0).toInt();
@@ -1149,6 +1155,8 @@ WriteLog("Pipelined DSP = %s\n", (vjs.usePipelinedDSP ? "ON" : "off"));
 	vjs.p2KeyBindings[BUTTON_9] = settings.value("p2k_9", Qt::Key_9).toInt();
 	vjs.p2KeyBindings[BUTTON_d] = settings.value("p2k_pound", Qt::Key_Slash).toInt();
 	vjs.p2KeyBindings[BUTTON_s] = settings.value("p2k_star", Qt::Key_Asterisk).toInt();
+
+	ReadProfiles(&settings);
 }
 
 
@@ -1161,6 +1169,7 @@ void MainWin::WriteSettings(void)
 
 	settings.setValue("zoom", zoomLevel);
 	settings.setValue("showUnknownSoftware", allowUnknownSoftware);
+	settings.setValue("lastEditedProfile", lastEditedProfile);
 
 	settings.setValue("useJoystick", vjs.useJoystick);
 	settings.setValue("joyport", vjs.joyport);
@@ -1227,6 +1236,8 @@ void MainWin::WriteSettings(void)
 	settings.setValue("p2k_9", vjs.p2KeyBindings[BUTTON_9]);
 	settings.setValue("p2k_pound", vjs.p2KeyBindings[BUTTON_d]);
 	settings.setValue("p2k_star", vjs.p2KeyBindings[BUTTON_s]);
+
+	WriteProfiles(&settings);
 }
 
 
@@ -1239,3 +1250,4 @@ void MainWin::WriteUISettings(void)
 
 	settings.setValue("zoom", zoomLevel);
 }
+