- dev.signal_button_press.connect(sigc::bind(sigc::mem_fun(this, &Hub::button_press), index));
- dev.signal_button_release.connect(sigc::bind(sigc::mem_fun(this, &Hub::button_release), index));
- dev.signal_axis_motion.connect(sigc::bind(sigc::mem_fun(this, &Hub::axis_motion), index));
- return index;
+ dev.signal_button_press.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::button_press), index), false));
+ dev.signal_button_release.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::button_release), index), false));
+ dev.signal_axis_motion.connect(sigc::bind_return(sigc::bind(sigc::mem_fun(this, &Hub::axis_motion), index), false));
+}
+
+Device *Hub::find_subdevice(DeviceType t, unsigned n)
+{
+ for(Device *d: devices)
+ if(Device *dev = d->find_subdevice(t, 0))
+ {
+ if(!n)
+ return dev;
+ --n;
+ }
+ return nullptr;
+}
+
+Device *Hub::find_subdevice(const string &n)
+{
+ if(n==name)
+ return this;
+ for(Device *d: devices)
+ if(Device *dev = d->find_subdevice(n))
+ return dev;
+ return nullptr;