diff options
Diffstat (limited to 'src/devices/machine/keyboard.h')
-rw-r--r-- | src/devices/machine/keyboard.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h index 4788d51f33b..2b4f32e856f 100644 --- a/src/devices/machine/keyboard.h +++ b/src/devices/machine/keyboard.h @@ -79,18 +79,11 @@ public: device_t *owner, u32 clock); - template <class FunctionClass> - void set_keyboard_callback(void (FunctionClass::*callback)(u8 character), const char *name) - { - set_keyboard_callback(output_delegate(callback, name, nullptr, static_cast<FunctionClass *>(nullptr))); - } - // FIXME: this should be aware of current device for resolving the tag - template <class FunctionClass> - void set_keyboard_callback(const char *devname, void (FunctionClass::*callback)(u8 character), const char *name) + template <typename... T> + void set_keyboard_callback(T &&... args) { - set_keyboard_callback(output_delegate(callback, name, devname, static_cast<FunctionClass *>(nullptr))); + m_keyboard_cb.set(std::forward<T>(args)...); } - void set_keyboard_callback(output_delegate callback) { m_keyboard_cb = callback; } virtual ioport_constructor device_input_ports() const override; |