diff options
author | mooglyguy <therealmogminer@gmail.com> | 2018-12-22 17:06:23 +0100 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2018-12-22 17:06:47 +0100 |
commit | dc8834b8dca7f63288f3f512d7e8600356485808 (patch) | |
tree | cb81425c648108f02542ae493e91ec96ad3d2ac4 /src/mame/audio/mario.cpp | |
parent | 1fd2f33b314b18237e80d8c6a9f70b580854802a (diff) |
Last round of macro removals before the freeze. (nw)
-sound/discrete, okim6295: Removed MCFG macros. [Ryan Holtz]
-norautp, osi, audio/mario: Removed MACHINE_CONFIG macros. [Ryan Holtz]
-vsmile: Split into its own driver from vii.cpp. [Ryan Holtz]
-vii: Fixed broken controller inputs. [Ryan Holtz]
-konamim2: Massive update. Most games work, but are still marked non-working due to rare MAME crashes in the PPC DRC. [Phil Bennett, Ryan Holtz]
Diffstat (limited to 'src/mame/audio/mario.cpp')
-rw-r--r-- | src/mame/audio/mario.cpp | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index 7759a09c720..95c073be458 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -635,8 +635,8 @@ void mario_state::masao_sound_map(address_map &map) * *************************************/ -MACHINE_CONFIG_START(mario_state::mario_audio) - +void mario_state::mario_audio(machine_config &config) +{ #if USE_8039 i8039_device &audiocpu(I8039(config, "audiocpu", I8035_CLOCK)); /* 730 kHz */ #else @@ -659,24 +659,22 @@ MACHINE_CONFIG_START(mario_state::mario_audio) GENERIC_LATCH_8(config, m_soundlatch4); #if OLD_SOUND - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(mario_discrete) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) + DISCRETE(config, m_discrete); + m_discrete->set_intf(mario_discrete); + m_discrete->add_route(ALL_OUTPUTS, "mono", 1); #else - MCFG_DEVICE_ADD("snd_nl", NETLIST_SOUND, 48000) - MCFG_NETLIST_SETUP(mario) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + netlist_mame_sound_device &snd_nl(NETLIST_SOUND(config, "snd_nl", 48000)); + snd_nl.set_constructor(netlist_mario); + snd_nl.add_route(ALL_OUTPUTS, "mono", 1.0); - MCFG_NETLIST_LOGIC_INPUT("snd_nl", "snd0", "SOUND0.IN", 0) - MCFG_NETLIST_LOGIC_INPUT("snd_nl", "snd1", "SOUND1.IN", 0) - MCFG_NETLIST_LOGIC_INPUT("snd_nl", "snd7", "SOUND7.IN", 0) - MCFG_NETLIST_INT_INPUT("snd_nl", "dac", "DAC.VAL", 0, 255) + NETLIST_LOGIC_INPUT(config, m_audio_snd0, "SOUND0.IN", 0); + NETLIST_LOGIC_INPUT(config, m_audio_snd1, "SOUND1.IN", 0); + NETLIST_LOGIC_INPUT(config, m_audio_snd7, "SOUND7.IN", 0); + NETLIST_INT_INPUT(config, m_audio_dac, "DAC.VAL", 0, 255); - MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "ROUT.1") - MCFG_NETLIST_ANALOG_MULT_OFFSET(150000.0, 0.0) + NETLIST_STREAM_OUTPUT(config, "snd_nl:cout0", 0, "ROUT.1").set_mult_offset(150000.0, 0.0); #endif - -MACHINE_CONFIG_END +} void mario_state::masao_audio(machine_config &config) { |