[Performous-commit] Tapio Vierros : Add auto-detection for Wii instruments.

[Yoda-JM <yo...@us...>]

Module: performous
Branch: controllers
Commit: fe970e73dcaf6479c8931107a297f05c22e31236

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jul 24 11:08:47 2010 +0300

Add auto-detection for Wii instruments.

---

 game/joystick.cc |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index 98640c1..35f192f 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -381,16 +381,26 @@ void input::SDL::init() {
 			input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_GH);
 		} else if( name.find("Harmonix Guitar") != std::string::npos ) {
 			if (name.find("Xbox") != std::string::npos) {
+				// "Harmonix Guitar for Xbox360 (Controller)"
 				std::cout << "  Detected as: RockBand Guitar Xbox360" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_XB360);
+			} else if (name.find("Nintendo") != std::string::npos) {
+				// "Licensed by Nintendo of America  Harmonix Guitar Controller for Nintendo Wii"
+				std::cout << "  Detected as: RockBand Drums PS3 (Wii Guitar)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Guitar PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
 			}
-		} else if( name.find("Harmonix Drum Kit") != std::string::npos || name.find("Harmonix Drum kit") != std::string::npos) {
+		} else if( name.find("Harmonix Drum") != std::string::npos) {
+			// Kit / kit / Controller
 			if (name.find("Xbox") != std::string::npos) {
 				std::cout << "  Detected as: RockBand Drums Xbox360" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_XB360);
+			} else if (name.find("Nintendo") != std::string::npos) {
+				// Licensed by Nintendo of America  Harmonix Drum Controller for Nintendo Wii
+				std::cout << "  Detected as: RockBand Guitar PS3 (Wii Drums)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Drums PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);