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/tms36xx.h | |
parent | f07b93b0532d379eb542ca507b103e71196e9147 (diff) |
de-staticify initializations for src/devices/sound (nw)
Diffstat (limited to 'src/devices/sound/tms36xx.h')
-rw-r--r-- | src/devices/sound/tms36xx.h | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/src/devices/sound/tms36xx.h b/src/devices/sound/tms36xx.h index d5a349b8713..01fdc22d306 100644 --- a/src/devices/sound/tms36xx.h +++ b/src/devices/sound/tms36xx.h @@ -10,19 +10,19 @@ //************************************************************************** #define MCFG_TMS36XX_ADD(tag, clock) \ - MCFG_DEVICE_ADD((tag), TMS36XX, (clock)) + MCFG_DEVICE_ADD((tag), TMS36XX, (clock)) #define MCFG_TMS36XX_REPLACE(tag, clock) \ - MCFG_DEVICE_REPLACE((tag), TMS36XX, (clock)) + MCFG_DEVICE_REPLACE((tag), TMS36XX, (clock)) #define MCFG_TMS36XX_TYPE(type) \ - tms36xx_device::set_subtype(*device, (tms36xx_device::subtype::type)); + downcast<tms36xx_device &>(*device).set_subtype((tms36xx_device::subtype::type)); #define MCFG_TMS36XX_DECAY_TIMES(_dec0, _dec1, _dec2, _dec3, _dec4, _dec5) \ - tms36xx_device::set_decays(*device, _dec0, _dec1, _dec2, _dec3, _dec4, _dec5); + downcast<tms36xx_device &>(*device).set_decays(_dec0, _dec1, _dec2, _dec3, _dec4, _dec5); #define MCFG_TMS36XX_TUNE_SPEED(_speed) \ - tms36xx_device::set_tune_speed(*device, _speed); + downcast<tms36xx_device &>(*device).set_tune_speed(_speed); //************************************************************************** @@ -46,38 +46,33 @@ public: tms36xx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - static void set_subtype(device_t &device, subtype type) + void set_subtype(subtype type) { - tms36xx_device &dev = downcast<tms36xx_device &>(device); switch (type) { case subtype::MM6221AA: - dev.m_subtype = "MM6221AA"; + m_subtype = "MM6221AA"; break; case subtype::TMS3615: - dev.m_subtype = "TMS3615"; + m_subtype = "TMS3615"; break; case subtype::TMS3617: - dev.m_subtype = "TMS3617"; + m_subtype = "TMS3617"; break; default: fatalerror("Invalid TMS36XX type: %d\n", int(type)); break; } } - static void set_tune_speed(device_t &device, double speed) + void set_tune_speed(double speed) { m_speed = (speed > 0) ? TMS36XX_VMAX / speed : TMS36XX_VMAX; } + void set_decays(double decay_0, double decay_1, double decay_2, double decay_3, double decay_4, double decay_5) { - downcast<tms36xx_device &>(device).m_speed = (speed > 0) ? TMS36XX_VMAX / speed : TMS36XX_VMAX; - } - static void set_decays(device_t &device, double decay_0, double decay_1, double decay_2, double decay_3, double decay_4, double decay_5) - { - tms36xx_device &dev = downcast<tms36xx_device &>(device); - dev.m_decay_time[0] = decay_0; - dev.m_decay_time[1] = decay_1; - dev.m_decay_time[2] = decay_2; - dev.m_decay_time[3] = decay_3; - dev.m_decay_time[4] = decay_4; - dev.m_decay_time[5] = decay_5; + m_decay_time[0] = decay_0; + m_decay_time[1] = decay_1; + m_decay_time[2] = decay_2; + m_decay_time[3] = decay_3; + m_decay_time[4] = decay_4; + m_decay_time[5] = decay_5; } protected: |