diff options
author | 2018-02-25 17:40:06 +0100 | |
---|---|---|
committer | 2018-02-25 17:40:06 +0100 | |
commit | 86f6ad0b5cd44799f8c2cfb9aad2727e32e9a4ce (patch) | |
tree | ed6d9dc25fb1f32a1894a98c916f3567b26f21b5 /src/devices/sound/nes_apu.h | |
parent | f07b93b0532d379eb542ca507b103e71196e9147 (diff) |
de-staticify initializations for src/devices/sound (nw)
Diffstat (limited to 'src/devices/sound/nes_apu.h')
-rw-r--r-- | src/devices/sound/nes_apu.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/sound/nes_apu.h b/src/devices/sound/nes_apu.h index 1410b02e189..67eb0ac4ff1 100644 --- a/src/devices/sound/nes_apu.h +++ b/src/devices/sound/nes_apu.h @@ -40,10 +40,10 @@ */ #define MCFG_NES_APU_IRQ_HANDLER(_devcb) \ - devcb = &nesapu_device::set_irq_handler(*device, DEVCB_##_devcb); + devcb = &downcast<nesapu_device &>(*device).set_irq_handler(DEVCB_##_devcb); #define MCFG_NES_APU_MEM_READ_CALLBACK(_devcb) \ - devcb = &nesapu_device::set_mem_read_callback(*device, DEVCB_##_devcb); + devcb = &downcast<nesapu_device &>(*device).set_mem_read_callback(DEVCB_##_devcb); class nesapu_device : public device_t, public device_sound_interface @@ -51,9 +51,9 @@ class nesapu_device : public device_t, public: nesapu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - // static configuration helpers - template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb) { return downcast<nesapu_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_mem_read_callback(device_t &device, Object &&cb) { return downcast<nesapu_device &>(device).m_mem_read_cb.set_callback(std::forward<Object>(cb)); } + // configuration helpers + template <class Object> devcb_base &set_irq_handler(Object &&cb) { return m_irq_handler.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_mem_read_callback(Object &&cb) { return m_mem_read_cb.set_callback(std::forward<Object>(cb)); } virtual void device_clock_changed() override; |