From c34af2034bb664c63f37fa0e99d3291ff604441c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 13 Sep 2014 12:31:16 +0000 Subject: [PATCH] Removed static config for discrete (nw) --- src/emu/bus/abckb/abc77.c | 2 +- src/emu/sound/discrete.c | 2 +- src/emu/sound/discrete.h | 1 - src/mame/audio/bwidow.c | 4 ++-- src/mame/audio/bzone.c | 2 +- src/mame/audio/crbaloon.c | 2 +- src/mame/audio/galaxian.c | 4 ++-- src/mame/audio/irem.c | 2 +- src/mame/audio/mario.c | 2 +- src/mame/audio/mw8080bw.c | 30 +++++++++++++++--------------- src/mame/audio/qix.c | 2 +- src/mame/audio/spiders.c | 2 +- src/mame/audio/vicdual.c | 4 ++-- src/mame/drivers/8080bw.c | 12 ++++++------ src/mame/drivers/asteroid.c | 6 +++--- src/mame/drivers/atarifb.c | 4 ++-- src/mame/drivers/avalnche.c | 2 +- src/mame/drivers/blockade.c | 2 +- src/mame/drivers/bsktball.c | 2 +- src/mame/drivers/btime.c | 2 +- src/mame/drivers/canyon.c | 2 +- src/mame/drivers/circus.c | 8 ++++---- src/mame/drivers/circusc.c | 2 +- src/mame/drivers/cliffhgr.c | 2 +- src/mame/drivers/copsnrob.c | 2 +- src/mame/drivers/dragrace.c | 2 +- src/mame/drivers/firetrk.c | 6 +++--- src/mame/drivers/galaga.c | 6 +++--- src/mame/drivers/galaxian.c | 4 ++-- src/mame/drivers/goldnpkr.c | 16 ++++++++-------- src/mame/drivers/grchamp.c | 2 +- src/mame/drivers/gyruss.c | 2 +- src/mame/drivers/hitme.c | 2 +- src/mame/drivers/ironhors.c | 2 +- src/mame/drivers/m14.c | 2 +- src/mame/drivers/m79amb.c | 2 +- src/mame/drivers/madalien.c | 2 +- src/mame/drivers/nitedrvr.c | 2 +- src/mame/drivers/norautp.c | 18 +++++++++--------- src/mame/drivers/orbit.c | 2 +- src/mame/drivers/phoenix.c | 2 +- src/mame/drivers/polepos.c | 2 +- src/mame/drivers/poolshrk.c | 2 +- src/mame/drivers/quantum.c | 2 +- src/mame/drivers/skydiver.c | 2 +- src/mame/drivers/skyraid.c | 2 +- src/mame/drivers/snk6502.c | 2 +- src/mame/drivers/sprint2.c | 6 +++--- src/mame/drivers/sprint4.c | 2 +- src/mame/drivers/sprint8.c | 2 +- src/mame/drivers/starshp1.c | 2 +- src/mame/drivers/subs.c | 2 +- src/mame/drivers/tank8.c | 2 +- src/mame/drivers/triplhnt.c | 2 +- src/mame/drivers/uapce.c | 2 +- src/mame/drivers/ultratnk.c | 2 +- src/mame/drivers/videopin.c | 2 +- src/mame/drivers/wiz.c | 2 +- src/mess/drivers/abc80x.c | 6 +++--- src/mess/drivers/hec2hrp.c | 12 ++++++------ src/mess/drivers/interact.c | 4 ++-- src/mess/drivers/osi.c | 4 ++-- src/mess/drivers/vidbrain.c | 2 +- src/mess/drivers/vip.c | 2 +- src/mess/drivers/vixen.c | 2 +- src/mess/machine/v1050kb.c | 2 +- 66 files changed, 124 insertions(+), 125 deletions(-) diff --git a/src/emu/bus/abckb/abc77.c b/src/emu/bus/abckb/abc77.c index c4f6ce92adc..a7614bdf9e0 100644 --- a/src/emu/bus/abckb/abc77.c +++ b/src/emu/bus/abckb/abc77.c @@ -144,7 +144,7 @@ static MACHINE_CONFIG_FRAGMENT( abc77 ) // discrete sound MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(abc77) + MCFG_DISCRETE_INTF(abc77) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c index 03711eaaa00..53401b401fd 100644 --- a/src/emu/sound/discrete.c +++ b/src/emu/sound/discrete.c @@ -859,7 +859,7 @@ void discrete_device::device_start() // create the stream //m_stream = machine().sound().stream_alloc(*this, 0, 2, 22257); - const discrete_block *intf_start = (m_intf != NULL) ? m_intf : (discrete_block *) static_config(); + const discrete_block *intf_start = m_intf; char name[32]; /* If a clock is specified we will use it, otherwise run at the audio sample rate. */ diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h index d61e7127bb0..d3972c0e444 100644 --- a/src/emu/sound/discrete.h +++ b/src/emu/sound/discrete.h @@ -4264,7 +4264,6 @@ public: #define MCFG_DISCRETE_INTF(_intf) \ discrete_device::static_set_intf(*device, (const discrete_block *)&(_intf##_discrete_interface)); -#define MCFG_SOUND_CONFIG_DISCRETE(name) MCFG_SOUND_CONFIG(name##_discrete_interface) //************************************************************************** // TYPE DEFINITIONS diff --git a/src/mame/audio/bwidow.c b/src/mame/audio/bwidow.c index 60ea502f46d..b4963ec56bd 100644 --- a/src/mame/audio/bwidow.c +++ b/src/mame/audio/bwidow.c @@ -159,7 +159,7 @@ MACHINE_CONFIG_FRAGMENT( bwidow_audio ) MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(bwidow) + MCFG_DISCRETE_INTF(bwidow) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -172,5 +172,5 @@ MACHINE_CONFIG_FRAGMENT( gravitar_audio ) MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(BW_R51, GRAV_C34, 5.0) /* BW_C31 ignored */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(gravitar) + MCFG_DISCRETE_INTF(gravitar) MACHINE_CONFIG_END diff --git a/src/mame/audio/bzone.c b/src/mame/audio/bzone.c index fab0af357c7..851981513b1 100644 --- a/src/mame/audio/bzone.c +++ b/src/mame/audio/bzone.c @@ -402,7 +402,7 @@ MACHINE_CONFIG_FRAGMENT( bzone_audio ) MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(bzone) + MCFG_DISCRETE_INTF(bzone) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c index 90b37865c04..8f59ac3d9ce 100644 --- a/src/mame/audio/crbaloon.c +++ b/src/mame/audio/crbaloon.c @@ -174,6 +174,6 @@ MACHINE_CONFIG_FRAGMENT( crbaloon_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(crbaloon) + MCFG_DISCRETE_INTF(crbaloon) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c index 997eb0c5fae..15b0ba69bff 100644 --- a/src/mame/audio/galaxian.c +++ b/src/mame/audio/galaxian.c @@ -510,7 +510,7 @@ MACHINE_CONFIG_FRAGMENT( galaxian_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(galaxian) + MCFG_DISCRETE_INTF(galaxian) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -520,7 +520,7 @@ MACHINE_CONFIG_FRAGMENT( mooncrst_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MCFG_SOUND_ADD(GAL_AUDIO, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(mooncrst) + MCFG_DISCRETE_INTF(mooncrst) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index 951b3236bea..78e67dfd85a 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -426,7 +426,7 @@ MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio ) MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 2) MCFG_SOUND_ADD("filtermix", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(m52_sound_c) + MCFG_DISCRETE_INTF(m52_sound_c) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 34512aaa943..8a742aea02b 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -622,7 +622,7 @@ MACHINE_CONFIG_FRAGMENT( mario_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(mario) + MCFG_DISCRETE_INTF(mario) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) MACHINE_CONFIG_END diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c index a23542f0d95..5525813f4c3 100644 --- a/src/mame/audio/mw8080bw.c +++ b/src/mame/audio/mw8080bw.c @@ -306,7 +306,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( tornbase_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(tornbase) + MCFG_DISCRETE_INTF(tornbase) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) MACHINE_CONFIG_END @@ -552,7 +552,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( maze_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(maze) + MCFG_DISCRETE_INTF(maze) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -799,7 +799,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( boothill_audio ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(boothill) + MCFG_DISCRETE_INTF(boothill) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -1029,7 +1029,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( checkmat_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(checkmat) + MCFG_DISCRETE_INTF(checkmat) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MACHINE_CONFIG_END @@ -1240,7 +1240,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( desertgu_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(desertgu) + MCFG_DISCRETE_INTF(desertgu) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MACHINE_CONFIG_END @@ -1505,7 +1505,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( dplay_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(dplay) + MCFG_DISCRETE_INTF(dplay) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MACHINE_CONFIG_END @@ -1902,7 +1902,7 @@ MACHINE_CONFIG_FRAGMENT( clowns_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(clowns) + MCFG_DISCRETE_INTF(clowns) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -2268,7 +2268,7 @@ MACHINE_CONFIG_FRAGMENT( spacwalk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(spacwalk) + MCFG_DISCRETE_INTF(spacwalk) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2497,7 +2497,7 @@ MACHINE_CONFIG_FRAGMENT( shuffle_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(shuffle) + MCFG_DISCRETE_INTF(shuffle) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2676,7 +2676,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( dogpatch_audio ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(dogpatch) + MCFG_DISCRETE_INTF(dogpatch) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -3214,7 +3214,7 @@ MACHINE_CONFIG_FRAGMENT( spcenctr_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(spcenctr) + MCFG_DISCRETE_INTF(spcenctr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END @@ -3414,7 +3414,7 @@ MACHINE_CONFIG_FRAGMENT( bowler_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(bowler) + MCFG_DISCRETE_INTF(bowler) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) MACHINE_CONFIG_END @@ -4132,7 +4132,7 @@ MACHINE_CONFIG_FRAGMENT( invaders_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(invaders) + MCFG_DISCRETE_INTF(invaders) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END @@ -4533,7 +4533,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( blueshrk_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(blueshrk) + MCFG_DISCRETE_INTF(blueshrk) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -4752,7 +4752,7 @@ MACHINE_CONFIG_FRAGMENT( invad2ct_audio ) MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(invad2ct) + MCFG_DISCRETE_INTF(invad2ct) MCFG_SOUND_ROUTE(0, "spk1", 0.5) MCFG_SOUND_ROUTE(1, "spk2", 0.5) diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c index 93eb087246a..1f6f2da03b5 100644 --- a/src/mame/audio/qix.c +++ b/src/mame/audio/qix.c @@ -195,7 +195,7 @@ MACHINE_CONFIG_FRAGMENT( qix_audio ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(qix) + MCFG_DISCRETE_INTF(qix) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/spiders.c b/src/mame/audio/spiders.c index ede38562401..a6252d249a1 100644 --- a/src/mame/audio/spiders.c +++ b/src/mame/audio/spiders.c @@ -205,6 +205,6 @@ MACHINE_CONFIG_FRAGMENT( spiders_audio ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(spiders) + MCFG_DISCRETE_INTF(spiders) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c index ac8b0725b66..7c090357d9f 100644 --- a/src/mame/audio/vicdual.c +++ b/src/mame/audio/vicdual.c @@ -118,7 +118,7 @@ MACHINE_CONFIG_FRAGMENT( frogs_audio ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(frogs) + MCFG_DISCRETE_INTF(frogs) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -448,7 +448,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_FRAGMENT( headon_audio ) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(headon) + MCFG_DISCRETE_INTF(headon) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index d1454f5b541..88822829637 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -1393,7 +1393,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( schaser, mw8080bw_root, _8080bw_state ) MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(schaser) + MCFG_DISCRETE_INTF(schaser) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1671,7 +1671,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( lupin3, mw8080bw_root, _8080bw_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(indianbt) + MCFG_DISCRETE_INTF(indianbt) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1703,7 +1703,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( lupin3a, mw8080bw_root, _8080bw_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(indianbt) + MCFG_DISCRETE_INTF(indianbt) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1833,7 +1833,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( polaris, mw8080bw_root, _8080bw_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(polaris) + MCFG_DISCRETE_INTF(polaris) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1957,7 +1957,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( ballbomb, mw8080bw_root, _8080bw_state ) MCFG_FRAGMENT_ADD(invaders_samples_audio) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(ballbomb) + MCFG_DISCRETE_INTF(ballbomb) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2198,7 +2198,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( indianbt, mw8080bw_root, _8080bw_state ) MCFG_FRAGMENT_ADD(invaders_samples_audio) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(indianbt) + MCFG_DISCRETE_INTF(indianbt) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c index bab910412c0..4653fa8c9b5 100644 --- a/src/mame/drivers/asteroid.c +++ b/src/mame/drivers/asteroid.c @@ -665,7 +665,7 @@ static MACHINE_CONFIG_START( asteroid, asteroid_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(asteroid) + MCFG_DISCRETE_INTF(asteroid) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4) MACHINE_CONFIG_END @@ -687,7 +687,7 @@ static MACHINE_CONFIG_DERIVED( astdelux, asteroid ) /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(astdelux) + MCFG_DISCRETE_INTF(astdelux) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ADD("pokey", POKEY, MASTER_CLOCK/8) @@ -713,7 +713,7 @@ static MACHINE_CONFIG_DERIVED( llander, asteroid ) /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(llander) + MCFG_DISCRETE_INTF(llander) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c index f6a9cff34aa..14740c6d455 100644 --- a/src/mame/drivers/atarifb.c +++ b/src/mame/drivers/atarifb.c @@ -571,7 +571,7 @@ static MACHINE_CONFIG_START( atarifb, atarifb_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(atarifb) + MCFG_DISCRETE_INTF(atarifb) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.18) MACHINE_CONFIG_END @@ -596,7 +596,7 @@ static MACHINE_CONFIG_DERIVED( abaseb, atarifb ) /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(abaseb) + MCFG_DISCRETE_INTF(abaseb) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.24) MACHINE_CONFIG_END diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c index 8611cc5f049..3bd25fc6583 100644 --- a/src/mame/drivers/avalnche.c +++ b/src/mame/drivers/avalnche.c @@ -261,7 +261,7 @@ static MACHINE_CONFIG_START( avalnche, avalnche_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(avalnche) + MCFG_DISCRETE_INTF(avalnche) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c index 20b21c39a86..9e92ad850d8 100644 --- a/src/mame/drivers/blockade.c +++ b/src/mame/drivers/blockade.c @@ -487,7 +487,7 @@ static MACHINE_CONFIG_START( blockade, blockade_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(blockade) + MCFG_DISCRETE_INTF(blockade) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c index e5c57c4df20..b56625ca488 100644 --- a/src/mame/drivers/bsktball.c +++ b/src/mame/drivers/bsktball.c @@ -266,7 +266,7 @@ static MACHINE_CONFIG_START( bsktball, bsktball_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(bsktball) + MCFG_DISCRETE_INTF(bsktball) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 9cd825f4a6d..3679e24d66d 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -1329,7 +1329,7 @@ static MACHINE_CONFIG_START( btime, btime_state ) MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 5) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(btime_sound) + MCFG_DISCRETE_INTF(btime_sound) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index dba8bfcb41f..8a742c18801 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -259,7 +259,7 @@ static MACHINE_CONFIG_START( canyon, canyon_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(canyon) + MCFG_DISCRETE_INTF(canyon) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c index 360e1194c68..79da8dba6b3 100644 --- a/src/mame/drivers/circus.c +++ b/src/mame/drivers/circus.c @@ -306,7 +306,7 @@ static MACHINE_CONFIG_START( circus, circus_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(circus) + MCFG_DISCRETE_INTF(circus) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END @@ -341,7 +341,7 @@ static MACHINE_CONFIG_START( robotbwl, circus_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(robotbwl) + MCFG_DISCRETE_INTF(robotbwl) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -383,7 +383,7 @@ static MACHINE_CONFIG_START( crash, circus_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(crash) + MCFG_DISCRETE_INTF(crash) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END @@ -417,7 +417,7 @@ static MACHINE_CONFIG_START( ripcord, circus_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(circus) + MCFG_DISCRETE_INTF(circus) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c index 183b6c07da4..1947afae120 100644 --- a/src/mame/drivers/circusc.c +++ b/src/mame/drivers/circusc.c @@ -369,7 +369,7 @@ static MACHINE_CONFIG_START( circusc, circusc_state ) MCFG_SOUND_ADD("fltdisc", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(circusc) + MCFG_DISCRETE_INTF(circusc) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 698ce74281d..5f9ab10b9f8 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -718,7 +718,7 @@ static MACHINE_CONFIG_START( cliffhgr, cliffhgr_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(cliffhgr) + MCFG_DISCRETE_INTF(cliffhgr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c index 1f1e7747306..63b7c93c472 100644 --- a/src/mame/drivers/copsnrob.c +++ b/src/mame/drivers/copsnrob.c @@ -264,7 +264,7 @@ static MACHINE_CONFIG_START( copsnrob, copsnrob_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(copsnrob) + MCFG_DISCRETE_INTF(copsnrob) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index 7ebe5382132..325e27ba09c 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -347,7 +347,7 @@ static MACHINE_CONFIG_START( dragrace, dragrace_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(dragrace) + MCFG_DISCRETE_INTF(dragrace) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index 5c84fd1ea8e..487486ed139 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -875,7 +875,7 @@ static MACHINE_CONFIG_START( firetrk, firetrk_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(firetrk) + MCFG_DISCRETE_INTF(firetrk) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -899,7 +899,7 @@ static MACHINE_CONFIG_DERIVED( superbug, firetrk ) /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(superbug) + MCFG_DISCRETE_INTF(superbug) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -923,7 +923,7 @@ static MACHINE_CONFIG_DERIVED( montecar, firetrk ) /* sound hardware */ MCFG_SOUND_REPLACE("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(montecar) + MCFG_DISCRETE_INTF(montecar) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index 282ff86b710..8a01db75614 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -1675,7 +1675,7 @@ static MACHINE_CONFIG_START( bosco, bosco_state ) /* discrete circuit on the 54XX outputs */ MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(bosco) + MCFG_DISCRETE_INTF(bosco) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END @@ -1739,7 +1739,7 @@ static MACHINE_CONFIG_START( galaga, galaga_state ) /* discrete circuit on the 54XX outputs */ MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(galaga) + MCFG_DISCRETE_INTF(galaga) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END @@ -1827,7 +1827,7 @@ static MACHINE_CONFIG_START( xevious, xevious_state ) /* discrete circuit on the 54XX outputs */ MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(galaga) + MCFG_DISCRETE_INTF(galaga) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index c9c3eeca067..1210557abaa 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -5050,7 +5050,7 @@ static MACHINE_CONFIG_FRAGMENT( konami_sound_1x_ay8910 ) MCFG_SOUND_ROUTE_EX(2, "konami", 1.0, 2) MCFG_SOUND_ADD("konami", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(konami_sound) + MCFG_DISCRETE_INTF(konami_sound) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_CONFIG_END @@ -5080,7 +5080,7 @@ static MACHINE_CONFIG_FRAGMENT( konami_sound_2x_ay8910 ) MCFG_SOUND_ROUTE_EX(2, "konami", 1.0, 5) MCFG_SOUND_ADD("konami", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(konami_sound) + MCFG_DISCRETE_INTF(konami_sound) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 28a50383626..d3f6242b2c2 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -3726,7 +3726,7 @@ static MACHINE_CONFIG_DERIVED( goldnpkr, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(goldnpkr) + MCFG_DISCRETE_INTF(goldnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3744,7 +3744,7 @@ static MACHINE_CONFIG_DERIVED( pottnpkr, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(pottnpkr) + MCFG_DISCRETE_INTF(pottnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3766,7 +3766,7 @@ static MACHINE_CONFIG_DERIVED( witchcrd, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(goldnpkr) + MCFG_DISCRETE_INTF(goldnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3813,7 +3813,7 @@ static MACHINE_CONFIG_DERIVED( wildcard, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(goldnpkr) + MCFG_DISCRETE_INTF(goldnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3837,7 +3837,7 @@ static MACHINE_CONFIG_DERIVED( wcrdxtnd, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(goldnpkr) + MCFG_DISCRETE_INTF(goldnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3888,7 +3888,7 @@ static MACHINE_CONFIG_DERIVED( genie, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(goldnpkr) + MCFG_DISCRETE_INTF(goldnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3905,7 +3905,7 @@ static MACHINE_CONFIG_DERIVED( mondial, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(goldnpkr) + MCFG_DISCRETE_INTF(goldnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3930,7 +3930,7 @@ static MACHINE_CONFIG_DERIVED( bchancep, goldnpkr_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(pottnpkr) + MCFG_DISCRETE_INTF(pottnpkr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c index 6f324d471a0..cbe64dfa653 100644 --- a/src/mame/drivers/grchamp.c +++ b/src/mame/drivers/grchamp.c @@ -678,7 +678,7 @@ static MACHINE_CONFIG_START( grchamp, grchamp_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.2) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(grchamp) + MCFG_DISCRETE_INTF(grchamp) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index 4be9dc5dedf..8dd48f0f2d1 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -531,7 +531,7 @@ static MACHINE_CONFIG_START( gyruss, gyruss_state ) MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 14) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(gyruss_sound) + MCFG_DISCRETE_INTF(gyruss_sound) MCFG_SOUND_ROUTE(0, "rspeaker", 1.0) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 3893d189556..79acbe54582 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -331,7 +331,7 @@ static MACHINE_CONFIG_START( hitme, hitme_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(hitme) + MCFG_DISCRETE_INTF(hitme) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index a3bbf090fe1..3515cc2e287 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -392,7 +392,7 @@ static MACHINE_CONFIG_START( ironhors, ironhors_state ) MCFG_SOUND_ROUTE_EX(3, "disc_ih", 1.0, 3) MCFG_SOUND_ADD("disc_ih", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(ironhors) + MCFG_DISCRETE_INTF(ironhors) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index 79492b48ab5..ffc1a7cf251 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -356,7 +356,7 @@ static MACHINE_CONFIG_START( m14, m14_state ) // MCFG_SPEAKER_STANDARD_MONO("mono") // MCFG_SOUND_ADD("discrete", DISCRETE, 0) -// MCFG_SOUND_CONFIG_DISCRETE(m14) +// MCFG_DISCRETE_INTF(m14) // MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index 689b89b194e..c0f8fc91078 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -202,7 +202,7 @@ static MACHINE_CONFIG_START( m79amb, m79amb_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(m79amb) + MCFG_DISCRETE_INTF(m79amb) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index f430d4e2b82..46e5e83b44f 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -181,7 +181,7 @@ static MACHINE_CONFIG_START( madalien, madalien_state ) MCFG_SOUND_ROUTE_EX(2, "discrete", 1.0, 2) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(madalien) + MCFG_DISCRETE_INTF(madalien) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c index e61c9ac0da8..57001671331 100644 --- a/src/mame/drivers/nitedrvr.c +++ b/src/mame/drivers/nitedrvr.c @@ -160,7 +160,7 @@ static MACHINE_CONFIG_START( nitedrvr, nitedrvr_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(nitedrvr) + MCFG_DISCRETE_INTF(nitedrvr) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index 1ec64fed9b6..96d67054c54 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -1255,7 +1255,7 @@ static MACHINE_CONFIG_START( noraut_base, norautp_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(norautp) + MCFG_DISCRETE_INTF(norautp) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1276,7 +1276,7 @@ static MACHINE_CONFIG_DERIVED( norautpl, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(kimble) + MCFG_DISCRETE_INTF(kimble) MACHINE_CONFIG_END @@ -1327,7 +1327,7 @@ static MACHINE_CONFIG_DERIVED( kimble, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(kimble) + MCFG_DISCRETE_INTF(kimble) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( newhilop, noraut_base ) @@ -1351,7 +1351,7 @@ static MACHINE_CONFIG_DERIVED( dphl, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(dphl) + MCFG_DISCRETE_INTF(dphl) MACHINE_CONFIG_END @@ -1364,7 +1364,7 @@ static MACHINE_CONFIG_DERIVED( dphla, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(dphl) + MCFG_DISCRETE_INTF(dphl) MACHINE_CONFIG_END @@ -1377,7 +1377,7 @@ static MACHINE_CONFIG_DERIVED( kimbldhl, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(kimble) + MCFG_DISCRETE_INTF(kimble) MACHINE_CONFIG_END @@ -1390,7 +1390,7 @@ static MACHINE_CONFIG_DERIVED( dphltest, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(dphl) + MCFG_DISCRETE_INTF(dphl) MACHINE_CONFIG_END @@ -1403,7 +1403,7 @@ static MACHINE_CONFIG_DERIVED( drhl, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(dphl) + MCFG_DISCRETE_INTF(dphl) MACHINE_CONFIG_END @@ -1416,7 +1416,7 @@ static MACHINE_CONFIG_DERIVED( ssjkrpkr, noraut_base ) /* sound hardware */ MCFG_SOUND_MODIFY("discrete") - MCFG_SOUND_CONFIG_DISCRETE(dphl) + MCFG_DISCRETE_INTF(dphl) MACHINE_CONFIG_END diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index d738fbb2a54..029d10d7b85 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( orbit, orbit_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(orbit) + MCFG_DISCRETE_INTF(orbit) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index fb345a895e1..cc63315c4fd 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -446,7 +446,7 @@ static MACHINE_CONFIG_START( phoenix, phoenix_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MCFG_SOUND_ADD("discrete", DISCRETE, 120000) - MCFG_SOUND_CONFIG_DISCRETE(phoenix) + MCFG_DISCRETE_INTF(phoenix) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6) MACHINE_CONFIG_END diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 1723bbb4d44..0da8e0c9a42 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -907,7 +907,7 @@ static MACHINE_CONFIG_START( polepos, polepos_state ) /* discrete circuit on the 54XX outputs */ MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(polepos) + MCFG_DISCRETE_INTF(polepos) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index 2d06f607013..7f5df38c801 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -234,7 +234,7 @@ static MACHINE_CONFIG_START( poolshrk, poolshrk_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(poolshrk) + MCFG_DISCRETE_INTF(poolshrk) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c index 60e16f4482c..4b7dddfe25b 100644 --- a/src/mame/drivers/quantum.c +++ b/src/mame/drivers/quantum.c @@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( quantum, quantum_state ) MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(quantum) + MCFG_DISCRETE_INTF(quantum) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c index 98a8be7a4c2..ff8cf4fd74c 100644 --- a/src/mame/drivers/skydiver.c +++ b/src/mame/drivers/skydiver.c @@ -397,7 +397,7 @@ static MACHINE_CONFIG_START( skydiver, skydiver_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(skydiver) + MCFG_DISCRETE_INTF(skydiver) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index 2310bc8d5f4..39e5a9fb9c8 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -238,7 +238,7 @@ static MACHINE_CONFIG_START( skyraid, skyraid_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(skyraid) + MCFG_DISCRETE_INTF(skyraid) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c index 3de2223d2d4..1554cd4835b 100644 --- a/src/mame/drivers/snk6502.c +++ b/src/mame/drivers/snk6502.c @@ -936,7 +936,7 @@ static MACHINE_CONFIG_DERIVED( fantasy, vanguard ) MCFG_SOUND_ROUTE_EX(0, "discrete", 1.0, 0) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(fantasy) + MCFG_DISCRETE_INTF(fantasy) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_DEVICE_REMOVE("sn76477.2") diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index 3189771bf45..26bff4ed055 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -507,7 +507,7 @@ static MACHINE_CONFIG_START( sprint2, sprint2_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(sprint2) + MCFG_DISCRETE_INTF(sprint2) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -523,7 +523,7 @@ static MACHINE_CONFIG_DERIVED( sprint1, sprint2 ) MCFG_DEVICE_REMOVE("discrete") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(sprint1) + MCFG_DISCRETE_INTF(sprint1) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -538,7 +538,7 @@ static MACHINE_CONFIG_DERIVED( dominos, sprint2 ) MCFG_DEVICE_REMOVE("discrete") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(dominos) + MCFG_DISCRETE_INTF(dominos) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c index c06d799658e..352c4fe772f 100644 --- a/src/mame/drivers/sprint4.c +++ b/src/mame/drivers/sprint4.c @@ -420,7 +420,7 @@ static MACHINE_CONFIG_START( sprint4, sprint4_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(sprint4) + MCFG_DISCRETE_INTF(sprint4) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c index 074e72b5355..65bf054e180 100644 --- a/src/mame/drivers/sprint8.c +++ b/src/mame/drivers/sprint8.c @@ -479,7 +479,7 @@ static MACHINE_CONFIG_START( sprint8, sprint8_state ) MCFG_SPEAKER_ADD("speaker_4_8", 0.2, 0.0, 1.0) /* right */ MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(sprint8) + MCFG_DISCRETE_INTF(sprint8) MCFG_SOUND_ROUTE(0, "speaker_1_2", 1.0) /* volumes on other channels defaulted to off, */ /* user can turn them up if needed. */ diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c index 94dfa3c39e5..4d87cf248d9 100644 --- a/src/mame/drivers/starshp1.c +++ b/src/mame/drivers/starshp1.c @@ -317,7 +317,7 @@ static MACHINE_CONFIG_START( starshp1, starshp1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(starshp1) + MCFG_DISCRETE_INTF(starshp1) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index d6492568703..4e45a78fdd5 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -211,7 +211,7 @@ static MACHINE_CONFIG_START( subs, subs_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(subs) + MCFG_DISCRETE_INTF(subs) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c index 1b20e73bbb5..d008ecb05d6 100644 --- a/src/mame/drivers/tank8.c +++ b/src/mame/drivers/tank8.c @@ -350,7 +350,7 @@ static MACHINE_CONFIG_START( tank8, tank8_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(tank8) + MCFG_DISCRETE_INTF(tank8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c index 8e32031c0b5..794500cc465 100644 --- a/src/mame/drivers/triplhnt.c +++ b/src/mame/drivers/triplhnt.c @@ -332,7 +332,7 @@ static MACHINE_CONFIG_START( triplhnt, triplhnt_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(triplhnt) + MCFG_DISCRETE_INTF(triplhnt) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MACHINE_CONFIG_END diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index b2ab765f0f0..6717e65d346 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -339,7 +339,7 @@ static MACHINE_CONFIG_START( uapce, uapce_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.5) MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(uapce) + MCFG_DISCRETE_INTF(uapce) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MACHINE_CONFIG_END diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c index 50b4267ec82..edad1a059e9 100644 --- a/src/mame/drivers/ultratnk.c +++ b/src/mame/drivers/ultratnk.c @@ -323,7 +323,7 @@ static MACHINE_CONFIG_START( ultratnk, ultratnk_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(ultratnk) + MCFG_DISCRETE_INTF(ultratnk) MCFG_SOUND_ROUTE(0, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c index 3fd530732da..9535eeda97d 100644 --- a/src/mame/drivers/videopin.c +++ b/src/mame/drivers/videopin.c @@ -351,7 +351,7 @@ static MACHINE_CONFIG_START( videopin, videopin_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(videopin) + MCFG_DISCRETE_INTF(videopin) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index d5a8ecc1e8c..e9f1eb38d18 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -842,7 +842,7 @@ static MACHINE_CONFIG_DERIVED( stinger, kungfut ) MCFG_DEVICE_REMOVE("8910.3") MCFG_SOUND_ADD("discrete", DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(stinger) + MCFG_DISCRETE_INTF(stinger) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c index d721fc9bb2f..6dd3448dd36 100644 --- a/src/mess/drivers/abc80x.c +++ b/src/mess/drivers/abc80x.c @@ -1015,7 +1015,7 @@ static MACHINE_CONFIG_START( abc800c, abc800c_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(abc800) + MCFG_DISCRETE_INTF(abc800) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) // peripheral hardware @@ -1090,7 +1090,7 @@ static MACHINE_CONFIG_START( abc800m, abc800m_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(abc800) + MCFG_DISCRETE_INTF(abc800) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) // peripheral hardware @@ -1165,7 +1165,7 @@ static MACHINE_CONFIG_START( abc802, abc802_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(abc800) + MCFG_DISCRETE_INTF(abc800) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) // peripheral hardware diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c index e86b336e0a1..78878fb35af 100644 --- a/src/mess/drivers/hec2hrp.c +++ b/src/mess/drivers/hec2hrp.c @@ -429,7 +429,7 @@ static MACHINE_CONFIG_START( hec2hr, hec2hrp_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) /* Son 1bit*/ - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* Gestion cassette*/ @@ -475,7 +475,7 @@ static MACHINE_CONFIG_START( hec2hrp, hec2hrp_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) // Son 1bit - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* Gestion cassette*/ @@ -535,7 +535,7 @@ static MACHINE_CONFIG_START( hec2mx40, hec2hrp_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) // Son 1bit - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* Gestion cassette*/ @@ -590,7 +590,7 @@ static MACHINE_CONFIG_START( hec2hrx, hec2hrp_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) // Son 1bit - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // Gestion cassette @@ -643,7 +643,7 @@ static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) // Son 1bit - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) // Gestion cassette @@ -699,7 +699,7 @@ static MACHINE_CONFIG_START( hec2mx80, hec2hrp_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) // Son 1bit - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* Gestion cassette*/ diff --git a/src/mess/drivers/interact.c b/src/mess/drivers/interact.c index 6db268795e8..4f03fbdb092 100644 --- a/src/mess/drivers/interact.c +++ b/src/mess/drivers/interact.c @@ -153,7 +153,7 @@ static MACHINE_CONFIG_START( interact, interact_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) /* Son 1bit*/ - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_CASSETTE_ADD( "cassette" ) @@ -200,7 +200,7 @@ static MACHINE_CONFIG_START( hector1, interact_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.1) MCFG_SOUND_ADD("discrete", DISCRETE, 0) /* Son 1bit*/ - MCFG_SOUND_CONFIG_DISCRETE( hec2hrp ) + MCFG_DISCRETE_INTF( hec2hrp ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_CASSETTE_ADD( "cassette" ) diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c index d57fdd35da0..588153d2322 100644 --- a/src/mess/drivers/osi.c +++ b/src/mess/drivers/osi.c @@ -734,7 +734,7 @@ static MACHINE_CONFIG_START( osi600, sb2m600_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(osi600_discrete_interface) + MCFG_DISCRETE_INTF(osi600_discrete_interface) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* cassette ACIA */ @@ -790,7 +790,7 @@ static MACHINE_CONFIG_START( c1p, c1p_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(osi600c_discrete_interface) + MCFG_DISCRETE_INTF(osi600c_discrete_interface) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MCFG_SOUND_ADD("beeper", BEEP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mess/drivers/vidbrain.c b/src/mess/drivers/vidbrain.c index ce2a5638b44..0cbb7d38969 100644 --- a/src/mess/drivers/vidbrain.c +++ b/src/mess/drivers/vidbrain.c @@ -550,7 +550,7 @@ static MACHINE_CONFIG_START( vidbrain, vidbrain_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(vidbrain) + MCFG_DISCRETE_INTF(vidbrain) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_ADD(DAC_TAG, DAC, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/mess/drivers/vip.c b/src/mess/drivers/vip.c index 45bd0cf06cd..56b46fb6b13 100644 --- a/src/mess/drivers/vip.c +++ b/src/mess/drivers/vip.c @@ -735,7 +735,7 @@ static MACHINE_CONFIG_START( vip, vip_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(vip) + MCFG_DISCRETE_INTF(vip) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_VIP_BYTEIO_PORT_ADD(VIP_BYTEIO_PORT_TAG, vip_byteio_cards, NULL, WRITELINE(vip_state, byteio_inst_w)) diff --git a/src/mess/drivers/vixen.c b/src/mess/drivers/vixen.c index ff97b02e450..5d066da46bd 100644 --- a/src/mess/drivers/vixen.c +++ b/src/mess/drivers/vixen.c @@ -770,7 +770,7 @@ static MACHINE_CONFIG_START( vixen, vixen_state ) // sound hardware MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(vixen) + MCFG_DISCRETE_INTF(vixen) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) // devices diff --git a/src/mess/machine/v1050kb.c b/src/mess/machine/v1050kb.c index 2965ea7b685..45ffcf45fed 100644 --- a/src/mess/machine/v1050kb.c +++ b/src/mess/machine/v1050kb.c @@ -90,7 +90,7 @@ static MACHINE_CONFIG_FRAGMENT( v1050_keyboard ) // discrete sound MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0) - MCFG_SOUND_CONFIG_DISCRETE(v1050kb) + MCFG_DISCRETE_INTF(v1050kb) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END