[Performous-commit] Vincent Le Ligeour : Added InputDev constructor

[knittl <kn...@us...>]

Module: performous
Branch: master
Commit: 09ca599cbbdc96fdcaed5269903b9172228f93cd

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Aug  1 15:20:21 2009 +0200

Added InputDev constructor

---

 game/joystick.hh |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/game/joystick.hh b/game/joystick.hh
index 6b8d0ff..0177861 100644
--- a/game/joystick.hh
+++ b/game/joystick.hh
@@ -127,7 +127,26 @@ namespace input {
 		// First gives a correct instrument type
 		// Then gives an unknown instrument type
 		// Finally throw an exception if only wrong (or none) instrument are available
-		InputDev(input::Type) : m_device_id() {input::Private::devices[m_device_id].assign();};
+		InputDev(input::Type _type) {
+			using namespace input::Private;
+			if( devices.size() == 0 ) throw std::runtime_error("No InputDev available");
+			for(InputDevs::iterator it = devices.begin() ; it != devices.end() ; ++it) {
+				if( !it->second.assigned() && it->second.type() == _type ) {
+					m_device_id = it->first;
+					it->second.assign();
+					return;
+				}
+			}
+			for(InputDevs::iterator it = devices.begin() ; it != devices.end() ; ++it) {
+				if( !it->second.assigned() && it->second.type() == input::Type::UNKNOWN ) {
+					m_device_id = it->first;
+					it->second.type(_type);
+					it->second.assign();
+					return;
+				}
+			}
+			throw std::runtime_error("No matching instrument available")
+		};
 		~InputDev() {input::Private::devices[m_device_id].unassign();};
 		bool tryPoll(InputDevEvent& _e) {return input::Private::devices[m_device_id].tryPoll(_e);};
 		void addEvent(InputDevEvent _e) {input::Private::devices[m_device_id].addEvent(_e);};