diff options
author | 2019-04-13 23:01:44 +0200 | |
---|---|---|
committer | 2019-04-13 23:03:07 +0200 | |
commit | 05fbba86b793571ad79c3e6ee87233b43fd36b32 (patch) | |
tree | 15c4bba0dfcf3bad89b2dc063467c6105e741f36 /src | |
parent | a6809196562986ff60dac410b1ab7cbca29a8606 (diff) |
Fix what I missed in the last commit. (nw)
Diffstat (limited to 'src')
-rw-r--r-- | src/mame/audio/cheekyms.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/1942.cpp | 12 | ||||
-rw-r--r-- | src/mame/drivers/cocoloco.cpp | 15 | ||||
-rw-r--r-- | src/mame/drivers/palestra.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/testpat.cpp | 4 |
5 files changed, 17 insertions, 18 deletions
diff --git a/src/mame/audio/cheekyms.cpp b/src/mame/audio/cheekyms.cpp index b05dd31fbff..c5c20fac127 100644 --- a/src/mame/audio/cheekyms.cpp +++ b/src/mame/audio/cheekyms.cpp @@ -55,7 +55,7 @@ MACHINE_CONFIG_START(cheekyms_audio_device::device_add_mconfig) NETLIST_LOGIC_INPUT(config, "sound_nl:pest_dies", "I_PEST_DIES.IN", 0); NETLIST_LOGIC_INPUT(config, "sound_nl:coin_extra", "I_COIN_EXTRA.IN", 0); - NETLIST_STREAM_OUTPUT(config, "sound_nl", 0, "VR1.2").set_mult_offset(30000.0 * 10.0, 0.0); + NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "VR1.2").set_mult_offset(30000.0 * 10.0, 0.0); MACHINE_CONFIG_END diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp index fc3048e3d72..e81b75e3d04 100644 --- a/src/mame/drivers/1942.cpp +++ b/src/mame/drivers/1942.cpp @@ -614,12 +614,12 @@ MACHINE_CONFIG_START(_1942_state::_1942) auto &snd_nl(NETLIST_SOUND(config, "snd_nl", AUDIO_CLOCK / 8 / 2)); snd_nl.set_constructor(NETLIST_NAME(nl_1942)); snd_nl.add_route(ALL_OUTPUTS, "mono", 5.0); - NETLIST_STREAM_INPUT(config, "snd_nl", 0, "R_AY1_1.R"); - NETLIST_STREAM_INPUT(config, "snd_nl", 1, "R_AY1_2.R"); - NETLIST_STREAM_INPUT(config, "snd_nl", 2, "R_AY1_3.R"); - NETLIST_STREAM_INPUT(config, "snd_nl", 3, "R_AY2_1.R"); - NETLIST_STREAM_INPUT(config, "snd_nl", 4, "R_AY2_2.R"); - NETLIST_STREAM_INPUT(config, "snd_nl", 5, "R_AY2_3.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin0", 0, "R_AY1_1.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin1", 1, "R_AY1_2.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin2", 2, "R_AY1_3.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin3", 3, "R_AY2_1.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin4", 4, "R_AY2_2.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin5", 5, "R_AY2_3.R"); NETLIST_STREAM_OUTPUT(config, "snd_nl", 0, "R1.1").set_mult_offset(70000.0, 0.0); //MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "VR.2") diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp index 202477886be..446051c41e5 100644 --- a/src/mame/drivers/cocoloco.cpp +++ b/src/mame/drivers/cocoloco.cpp @@ -537,16 +537,15 @@ MACHINE_CONFIG_START(cocoloco_state::cocoloco) /* NETLIST configuration using internal AY8910 resistor values */ - MCFG_DEVICE_ADD("snd_nl", NETLIST_SOUND, 48000) - MCFG_NETLIST_SETUP(nl_cocoloco) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + auto &snd_nl(NETLIST_SOUND(config, "snd_nl", 48000)); + snd_nl.set_constructor(NETLIST_NAME(nl_cocoloco)); + snd_nl.add_route(ALL_OUTPUTS, "mono", 1.0); - MCFG_NETLIST_STREAM_INPUT("snd_nl", 0, "R_AY1_1.R") - MCFG_NETLIST_STREAM_INPUT("snd_nl", 1, "R_AY1_2.R") - MCFG_NETLIST_STREAM_INPUT("snd_nl", 2, "R_AY1_3.R") + NETLIST_STREAM_INPUT(config, "snd_nl:cin0", 0, "R_AY1_1.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin1", 1, "R_AY1_2.R"); + NETLIST_STREAM_INPUT(config, "snd_nl:cin2", 2, "R_AY1_3.R"); - MCFG_NETLIST_STREAM_OUTPUT("snd_nl", 0, "RAMP.1") - MCFG_NETLIST_ANALOG_MULT_OFFSET(30000.0 * 1.5, 0) + NETLIST_STREAM_OUTPUT(config, "snd_nl:cout0", 0, "RAMP.1").set_mult_offset(30000.0 * 1.5, 0); MACHINE_CONFIG_END diff --git a/src/mame/drivers/palestra.cpp b/src/mame/drivers/palestra.cpp index a4c188675fd..f97f97ab8d6 100644 --- a/src/mame/drivers/palestra.cpp +++ b/src/mame/drivers/palestra.cpp @@ -75,7 +75,7 @@ MACHINE_CONFIG_START(palestra_state::palestra) NETLIST_CPU(config, m_maincpu, NETLIST_CLOCK); m_maincpu->set_constructor(netlist_palestra); - MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_composite_monochrome, "fixfreq") + NETLIST_ANALOG_OUTPUT(config, "maincpu:vid0").set_params("videomix", FUNC(fixedfreq_device::update_composite_monochrome), "fixfreq"); SCREEN(config, "screen", SCREEN_TYPE_RASTER); FIXFREQ(config, m_video).set_screen("screen"); diff --git a/src/mame/drivers/testpat.cpp b/src/mame/drivers/testpat.cpp index 6806166c15b..6bf0e01a184 100644 --- a/src/mame/drivers/testpat.cpp +++ b/src/mame/drivers/testpat.cpp @@ -106,7 +106,7 @@ MACHINE_CONFIG_START(tp1983_state::tp1983) NETLIST_CPU(config, m_maincpu, NETLIST_CLOCK); m_maincpu->set_constructor(netlist_tp1983); - MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", fixedfreq_device, update_composite_monochrome, "fixfreq") + NETLIST_ANALOG_OUTPUT(config, "maincpu:vid0").set_params("videomix", FUNC(fixedfreq_device::update_composite_monochrome), "fixfreq"); SCREEN(config, "screen", SCREEN_TYPE_RASTER); FIXFREQ(config, m_video).set_screen("screen"); @@ -122,7 +122,7 @@ MACHINE_CONFIG_START(tp1985_state::tp1985) NETLIST_CPU(config, m_maincpu, NETLIST_CLOCK); m_maincpu->set_constructor(netlist_tp1985); - MCFG_NETLIST_ANALOG_OUTPUT("maincpu", "vid0", "videomix", tp1985_state, video_out_cb, "") + NETLIST_ANALOG_OUTPUT(config, "maincpu:vid0").set_params("videomix", FUNC(tp1985_state::video_out_cb), ""); SCREEN(config, "screen", SCREEN_TYPE_RASTER); FIXFREQ(config, m_video).set_screen("screen"); |