X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fhub.h;h=8d41bcee41393bc0314825db0c44b1fc2b65fc61;hb=21b0c47700f1b570b6129384ce0b96a0c6b48ffd;hp=9fe57dd95a3bef2a501c23156b9812716fe0074d;hpb=47df97f4381412236a02f0fcf71a2e9b23f78187;p=libs%2Fgui.git

diff --git a/source/input/hub.h b/source/input/hub.h
index 9fe57dd..8d41bce 100644
--- a/source/input/hub.h
+++ b/source/input/hub.h
@@ -1,6 +1,7 @@
-#ifndef MSP_GBASE_INPUTHUB_H_
-#define MSP_GBASE_INPUTHUB_H_
+#ifndef MSP_INPUT_INPUTHUB_H_
+#define MSP_INPUT_INPUTHUB_H_
 
+#include <map>
 #include "device.h"
 
 namespace Msp {
@@ -13,14 +14,13 @@ aggregate of them.  Button and axis numbers are mapped to unique values.
 class Hub: public Device
 {
 protected:
-	std::vector<Device *> devices;
+	std::map<unsigned, Device *> devices;
 
 public:
 	Hub();
 
-	/** Attaches an input device to the hub.  Returns the index of the device
-	within the hub. */
-	unsigned attach(Device &dev);
+	/// Attaches an input device to the hub.
+	void attach(Device &dev);
 
 	virtual std::string get_button_name(unsigned) const;
 	virtual std::string get_axis_name(unsigned) const;