X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fgamepad.cpp;h=8706e17643667499b39d8fe78caed6190898181a;hb=94d59c2c8c14b9ac51dffd117ec507418b4d0881;hp=62a6d7a9bef851d932aba79f87c305fc3a2aa36b;hpb=7228359373eb7602c26f7b098d6b2271ff5727a1;p=virtualjaguar

diff --git a/src/gui/gamepad.cpp b/src/gui/gamepad.cpp
index 62a6d7a..8706e17 100644
--- a/src/gui/gamepad.cpp
+++ b/src/gui/gamepad.cpp
@@ -18,6 +18,7 @@
 // Class member initialization
 /*static*/ int Gamepad::numJoysticks = 0;
 /*static*/ SDL_Joystick * Gamepad::pad[8];
+/*static*/ const char * Gamepad::padName[8];
 /*static*/ int Gamepad::numButtons[8];
 /*static*/ int Gamepad::numHats[8];
 /*static*/ int Gamepad::numAxes[8];
@@ -50,6 +51,7 @@ void Gamepad::AllocateJoysticks(void)
 	for(int i=0; i<numJoysticks; i++)
 	{
 		pad[i] = SDL_JoystickOpen(i);
+		padName[i] = SDL_JoystickName(i);
 		numButtons[i] = numHats[i] = 0;
 
 		if (pad[i])
@@ -71,6 +73,16 @@ void Gamepad::DeallocateJoysticks(void)
 }
 
 
+const char * Gamepad::GetJoystickName(int joystickID)
+{
+	// Sanity check
+	if (joystickID >= 8)
+		return NULL;
+
+	return padName[joystickID];
+}
+
+
 bool Gamepad::GetState(int joystickID, int buttonID)
 {
 	uint8_t hatMask[8] = { 1, 2, 4, 8, 16, 32, 64, 128 };