X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fdevice.h;h=e80029054548fe82c0a985bb2690b23c6773021c;hb=6222d13e2790bdaa1013444f1221841397834cdd;hp=be708e2636a2ae88010c5d9ba79a31b0abf2835b;hpb=75a3f0fd4152a71aefec72cb053846646071af03;p=libs%2Fgui.git

diff --git a/source/input/device.h b/source/input/device.h
index be708e2..e800290 100644
--- a/source/input/device.h
+++ b/source/input/device.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include <stdexcept>
 #include <sigc++/signal.h>
+#include <msp/strings/lexicalcast.h>
 
 namespace Msp {
 namespace Input {
@@ -13,7 +14,6 @@ class device_not_available: public std::runtime_error
 {
 public:
 	device_not_available(const std::string &w): std::runtime_error(w) { }
-	virtual ~device_not_available() throw() { }
 };
 
 
@@ -57,7 +57,7 @@ public:
 	sigc::signal<bool, unsigned, float, float>::accumulated<EventAccumulator> signal_axis_motion;
 
 protected:
-	DeviceType type;
+	DeviceType type = UNSPECIFIED;
 	std::string name;
 	std::vector<char> buttons;
 	std::vector<float> axes;
@@ -68,6 +68,8 @@ public:
 
 	DeviceType get_type() const { return type; }
 	const std::string &get_name() const { return name; }
+	virtual Device *find_subdevice(DeviceType, unsigned = 0);
+	virtual Device *find_subdevice(const std::string &);
 	bool get_button_state(unsigned) const;
 	float get_axis_value(unsigned) const;
 
@@ -78,6 +80,10 @@ protected:
 	void set_axis_value(unsigned, float, bool);
 };
 
+
+void operator>>(const LexicalConverter &, DeviceType &);
+void operator<<(LexicalConverter &, DeviceType);
+
 } // namespace Input
 } // namespace Msp