X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fhub.h;h=31eeb94bf5dfb220c793d73d6cff533b345204e5;hb=b45ba2f7ceb60c1a6abc1a951a97b40c03671264;hp=4385f27742e83588e59cf686b88a5dd653d33bdc;hpb=999ca92aa9ee10585c0b2094d84364159253982f;p=libs%2Fgui.git

diff --git a/source/input/hub.h b/source/input/hub.h
index 4385f27..31eeb94 100644
--- a/source/input/hub.h
+++ b/source/input/hub.h
@@ -1,13 +1,8 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GBASE_INPUTHUB_H_
-#define MSP_GBASE_INPUTHUB_H_
+#ifndef MSP_INPUT_INPUTHUB_H_
+#define MSP_INPUT_INPUTHUB_H_
 
+#include <map>
+#include <sigc++/trackable.h>
 #include "device.h"
 
 namespace Msp {
@@ -17,24 +12,19 @@ namespace Input {
 The Hub device collects events from multiple input devices and presents an
 aggregate of them.  Button and axis numbers are mapped to unique values.
 */
-class Hub: public Device
+class Hub: public Device, public sigc::trackable
 {
 protected:
-	std::vector<Device *> devices;
+	std::map<unsigned, Device *> devices;
 
 public:
 	Hub();
 
-	/**
-	Attaches an input device to the hub.
-
-	@param   dev  Device to attach
-
-	@return  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;
 protected:
 	void button_press(unsigned, unsigned);
 	void button_release(unsigned, unsigned);