From 705dde329e2f138bcfae02a7f97b931e03af888f Mon Sep 17 00:00:00 2001 From: smf- Date: Sat, 29 Oct 2016 12:16:30 +0100 Subject: [PATCH] removed msm5205 volume trampoline (nw) --- src/devices/sound/msm5205.cpp | 5 ----- src/devices/sound/msm5205.h | 1 - src/mame/drivers/tbowl.cpp | 2 +- src/mame/drivers/tecmo.cpp | 2 +- src/mame/machine/pce_cd.cpp | 8 ++++---- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp index c61762ee3ca..ee1a8400558 100644 --- a/src/devices/sound/msm5205.cpp +++ b/src/devices/sound/msm5205.cpp @@ -290,11 +290,6 @@ void msm5205_device::playmode_w(int select) } -void msm5205_device::set_volume(int volume) -{ - m_stream->set_output_gain(0,volume / 100.0); -} - void msm5205_device::change_clock_w(int32_t clock) { attotime period; diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h index d780d137c36..f45b4a67a99 100644 --- a/src/devices/sound/msm5205.h +++ b/src/devices/sound/msm5205.h @@ -61,7 +61,6 @@ public: // option , selected pin seletor void playmode_w(int select); - void set_volume(int volume); void change_clock_w(int32_t clock); protected: diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index 6a40aac2228..5e372595193 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -137,7 +137,7 @@ WRITE8_MEMBER(tbowl_state::adpcm_end_w) WRITE8_MEMBER(tbowl_state::adpcm_vol_w) { msm5205_device *adpcm = (offset & 1) ? m_msm2 : m_msm1; - adpcm->set_volume((data & 0x7f) * 100 / 0x7f); + adpcm->set_output_gain(ALL_OUTPUTS, (data & 127) / 127.0); } void tbowl_state::adpcm_int( msm5205_device *device, int num ) diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp index 7474c13373e..1ccb1f928d0 100644 --- a/src/mame/drivers/tecmo.cpp +++ b/src/mame/drivers/tecmo.cpp @@ -90,7 +90,7 @@ WRITE8_MEMBER(tecmo_state::adpcm_end_w) WRITE8_MEMBER(tecmo_state::adpcm_vol_w) { - m_msm->set_volume((data & 0x0f) * 100 / 15); + m_msm->set_output_gain(ALL_OUTPUTS, (data & 15) / 15.0); } WRITE_LINE_MEMBER(tecmo_state::adpcm_int) diff --git a/src/mame/machine/pce_cd.cpp b/src/mame/machine/pce_cd.cpp index 0e4c9ea390a..c8b5052207d 100644 --- a/src/mame/machine/pce_cd.cpp +++ b/src/mame/machine/pce_cd.cpp @@ -1043,14 +1043,14 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadeout_callback) if (m_adpcm_volume <= 0) { m_adpcm_volume = 0.0; - m_msm->set_volume(0.0); m_adpcm_fadeout_timer->adjust(attotime::never); } else { - m_msm->set_volume(m_adpcm_volume); m_adpcm_fadeout_timer->adjust(attotime::from_usec(param), param); } + + m_msm->set_output_gain(ALL_OUTPUTS, m_adpcm_volume / 100.0); } TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadein_callback) @@ -1060,14 +1060,14 @@ TIMER_CALLBACK_MEMBER(pce_cd_device::adpcm_fadein_callback) if (m_adpcm_volume >= 100.0) { m_adpcm_volume = 100.0; - m_msm->set_volume(100.0); m_adpcm_fadein_timer->adjust(attotime::never); } else { - m_msm->set_volume(m_adpcm_volume); m_adpcm_fadein_timer->adjust(attotime::from_usec(param), param); } + + m_msm->set_output_gain(ALL_OUTPUTS, m_adpcm_volume / 100.0); }