- const Device &dev = *get_item(devices, axis>>12);
- return dev.get_name()+": "+dev.get_axis_name(axis&0xFFF);
+ unsigned dev_index = btn>>8;
+ if(dev_index>=devices.size())
+ throw out_of_range("Hub::get_button_name");
+
+ const Device &dev = *devices[dev_index];
+ return dev.get_name()+": "+dev.get_button_name(btn&0xFF);
+}
+
+string Hub::get_axis_name(unsigned axis) const
+{
+ unsigned dev_index = axis>>8;
+ if(dev_index>=devices.size())
+ throw out_of_range("Hub::get_axis_name");
+
+ const Device &dev = *devices[dev_index];
+ return dev.get_name()+": "+dev.get_axis_name(axis&0xFF);