diff options
author | Vas Crabb <vas@vastheman.com> | 2019-09-20 00:28:19 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-09-20 00:28:19 +1000 |
commit | dac7094f3431b8f933497b0c7693e6baeb1bb75c (patch) | |
tree | 1c3dc049110c54d23dc31a1e6c1e8b11fd24e299 /src/mame/audio | |
parent | cc25024f791747fa17c1f06bd81c482a86aac91b (diff) |
(nw) misc cleanup:
* get rid of most assert_always
* get rid of a few MCFG_*_OVERRIDE
Diffstat (limited to 'src/mame/audio')
-rw-r--r-- | src/mame/audio/geebee.cpp | 12 | ||||
-rw-r--r-- | src/mame/audio/snes_snd.cpp | 5 | ||||
-rw-r--r-- | src/mame/audio/t5182.cpp | 10 | ||||
-rw-r--r-- | src/mame/audio/warpwarp.cpp | 24 |
4 files changed, 24 insertions, 27 deletions
diff --git a/src/mame/audio/geebee.cpp b/src/mame/audio/geebee.cpp index 76f79bb1c86..037a398dc3b 100644 --- a/src/mame/audio/geebee.cpp +++ b/src/mame/audio/geebee.cpp @@ -58,13 +58,13 @@ void geebee_sound_device::device_timer(emu_timer &timer, device_timer_id id, int { switch (id) { - case TIMER_VOLUME_DECAY: - if (--m_volume < 0) - m_volume = 0; - break; + case TIMER_VOLUME_DECAY: + if (--m_volume < 0) + m_volume = 0; + break; - default: - assert_always(false, "Unknown id in geebee_device::device_timer"); + default: + throw emu_fatalerror("Unknown id in geebee_device::device_timer"); } } diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp index e4f1b91a517..2f8a23f48da 100644 --- a/src/mame/audio/snes_snd.cpp +++ b/src/mame/audio/snes_snd.cpp @@ -240,10 +240,7 @@ inline void snes_sound_device::update_timer_tick(u8 which) void snes_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { if (id != TIMER_TICK_ID) - { - assert_always(false, "Unknown id in snes_sound_device::device_timer"); - return; - } + throw emu_fatalerror("Unknown id in snes_sound_device::device_timer"); for (int ch = 0; ch < 3; ch++) update_timer_tick(ch); diff --git a/src/mame/audio/t5182.cpp b/src/mame/audio/t5182.cpp index 2cc831bf63d..b867a5777a5 100644 --- a/src/mame/audio/t5182.cpp +++ b/src/mame/audio/t5182.cpp @@ -225,11 +225,11 @@ void t5182_device::device_timer(emu_timer &timer, device_timer_id id, int param, { switch (id) { - case SETIRQ_CB: - setirq_callback(ptr, param); - break; - default: - assert_always(false, "Unknown id in t5182_device::device_timer"); + case SETIRQ_CB: + setirq_callback(ptr, param); + break; + default: + throw emu_fatalerror("Unknown id in t5182_device::device_timer"); } } diff --git a/src/mame/audio/warpwarp.cpp b/src/mame/audio/warpwarp.cpp index 9e482e3a538..2e4075771ea 100644 --- a/src/mame/audio/warpwarp.cpp +++ b/src/mame/audio/warpwarp.cpp @@ -75,18 +75,18 @@ void warpwarp_sound_device::device_timer(emu_timer &timer, device_timer_id id, i { switch (id) { - case TIMER_SOUND_VOLUME_DECAY: - if (--m_sound_volume < 0) - m_sound_volume = 0; - break; - - case TIMER_MUSIC_VOLUME_DECAY: - if (--m_music_volume < 0) - m_music_volume = 0; - break; - - default: - assert_always(false, "Unknown id in warpwarp_sound_device::device_timer"); + case TIMER_SOUND_VOLUME_DECAY: + if (--m_sound_volume < 0) + m_sound_volume = 0; + break; + + case TIMER_MUSIC_VOLUME_DECAY: + if (--m_music_volume < 0) + m_music_volume = 0; + break; + + default: + throw emu_fatalerror("Unknown id in warpwarp_sound_device::device_timer"); } } |