diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-08 07:35:22 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-08 07:35:22 +1000 |
commit | 4ef4464aec13029fa7e394671743e9ea96394528 (patch) | |
tree | 757cd23c65c626d63f4c98afb366362f4c2d6bdb /src/mame/audio | |
parent | 765d625ac78ea14cec1e1a84c56567d980924869 (diff) |
Add support for custom device constructors when replacing devices.
Current syntax: MCFG_DEVICE_REPLACE(tag_or_finder, TYPE, ...)
Next-generation syntax: TYPE(config.replace(), tag_or_finder, ...)
(nw) Kill off some more low-value macros that aren't needed any more,
and get rid of the token-pasting voodoo and casts in the discrete sound
macros.
Diffstat (limited to 'src/mame/audio')
51 files changed, 123 insertions, 158 deletions
diff --git a/src/mame/audio/8080bw.cpp b/src/mame/audio/8080bw.cpp index a62568a5ae8..518d1db7a0b 100644 --- a/src/mame/audio/8080bw.cpp +++ b/src/mame/audio/8080bw.cpp @@ -213,7 +213,7 @@ static const discrete_dac_r1_ladder ballbomb_music_dac = /* Nodes - Sounds */ #define BALLBOMB_MUSIC NODE_11 -DISCRETE_SOUND_START(ballbomb) +DISCRETE_SOUND_START(ballbomb_discrete) DISCRETE_INPUT_DATA (BALLBOMB_MUSIC_DATA) @@ -293,7 +293,7 @@ static const discrete_dac_r1_ladder indianbt_music_dac = /* Nodes - Sounds */ #define INDIANBT_MUSIC NODE_11 -DISCRETE_SOUND_START(indianbt) +DISCRETE_SOUND_START(indianbt_discrete) DISCRETE_INPUT_DATA (INDIANBT_MUSIC_DATA) @@ -504,7 +504,7 @@ static const discrete_mixer_desc polaris_mixer_vr4_desc = #define POLARIS_ADJ_VR2 NODE_24 #define POLARIS_ADJ_VR3 NODE_25 -DISCRETE_SOUND_START(polaris) +DISCRETE_SOUND_START(polaris_discrete) /************************************************/ /* Polaris sound system: 8 Sound Sources */ @@ -781,7 +781,7 @@ WRITE8_MEMBER(_8080bw_state::polaris_sh_port_3_w) #define SCHASER_EXP_SND NODE_11 #define SCHASER_MUSIC_SND NODE_12 -DISCRETE_SOUND_START(schaser) +DISCRETE_SOUND_START(schaser_discrete) /************************************************/ /* Input register mapping for schaser */ /************************************************/ diff --git a/src/mame/audio/asteroid.cpp b/src/mame/audio/asteroid.cpp index 7eb5816c913..afcb68898bf 100644 --- a/src/mame/audio/asteroid.cpp +++ b/src/mame/audio/asteroid.cpp @@ -71,7 +71,7 @@ static const discrete_555_cc_desc asteroid_thump_555cc = #define ASTEROID_EXPLODE_SND NODE_26 #define ASTEROID_THRUST_SND NODE_27 -static DISCRETE_SOUND_START(asteroid) +static DISCRETE_SOUND_START(asteroid_discrete) /************************************************/ /* Asteroid Effects Relataive Gain Table */ /* */ @@ -217,7 +217,7 @@ static DISCRETE_SOUND_START(asteroid) DISCRETE_SOUND_END -static DISCRETE_SOUND_START(astdelux) +static DISCRETE_SOUND_START(astdelux_discrete) /************************************************/ /* Asteroid delux sound hardware is mostly done */ /* in the Pokey chip except for the thrust and */ @@ -318,8 +318,7 @@ WRITE8_MEMBER(asteroid_state::asteroid_noise_reset_w) MACHINE_CONFIG_START(asteroid_state::asteroid_sound) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(asteroid) + MCFG_DEVICE_ADD("discrete", DISCRETE, asteroid_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4) MCFG_DEVICE_ADD("audiolatch", LS259, 0) // M10 @@ -335,8 +334,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(asteroid_state::astdelux_sound) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(astdelux) + MCFG_DEVICE_ADD("discrete", DISCRETE, astdelux_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_DEVICE_ADD("audiolatch", LS259, 0) // M10 diff --git a/src/mame/audio/atarifb.cpp b/src/mame/audio/atarifb.cpp index e58c9cbbd24..1a241886671 100644 --- a/src/mame/audio/atarifb.cpp +++ b/src/mame/audio/atarifb.cpp @@ -79,7 +79,7 @@ static const discrete_mixer_desc atarifb_mixer = #define ATARIFB_WHISTLE_SND NODE_12 #define ATARIFB_CROWD_SND NODE_13 -DISCRETE_SOUND_START(atarifb) +DISCRETE_SOUND_START(atarifb_discrete) /************************************************/ /* Input register mapping for atarifb */ /************************************************/ @@ -169,7 +169,7 @@ static const discrete_mixer_desc abaseb_mixer = #define ABASEB_WHISTLE_SND NODE_12 #define ABASEB_CROWD_SND NODE_13 -DISCRETE_SOUND_START(abaseb) +DISCRETE_SOUND_START(abaseb_discrete) /************************************************/ /* Input register mapping for abaseb */ /************************************************/ diff --git a/src/mame/audio/avalnche.cpp b/src/mame/audio/avalnche.cpp index 9590658a7c4..2803c2da03a 100644 --- a/src/mame/audio/avalnche.cpp +++ b/src/mame/audio/avalnche.cpp @@ -55,7 +55,7 @@ static const discrete_lfsr_desc avalnche_lfsr={ #define AVALNCHE_AUD2_SND NODE_12 #define AVALNCHE_SOUNDLVL_AUD0_SND NODE_13 -static DISCRETE_SOUND_START(avalnche) +static DISCRETE_SOUND_START(avalnche_discrete) /************************************************/ /* avalnche Effects Relataive Gain Table */ /* */ @@ -106,8 +106,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(avalnche_state::avalnche_sound) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(avalnche) + MCFG_DEVICE_ADD("discrete", DISCRETE, avalnche_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_DEVICE_MODIFY("latch") diff --git a/src/mame/audio/bsktball.cpp b/src/mame/audio/bsktball.cpp index 3322c33dc92..287d6523d6e 100644 --- a/src/mame/audio/bsktball.cpp +++ b/src/mame/audio/bsktball.cpp @@ -86,7 +86,7 @@ static const discrete_mixer_desc bsktball_mixer = #define BSKTBALL_NOTE_SND NODE_12 #define BSKTBALL_CROWD_SND NODE_13 -DISCRETE_SOUND_START(bsktball) +DISCRETE_SOUND_START(bsktball_discrete) /************************************************/ /* Input register mapping for bsktball */ /************************************************/ diff --git a/src/mame/audio/bwidow.cpp b/src/mame/audio/bwidow.cpp index 5bb074aefa3..1d0c55bab27 100644 --- a/src/mame/audio/bwidow.cpp +++ b/src/mame/audio/bwidow.cpp @@ -71,7 +71,7 @@ static discrete_mixer_desc bwidow_mixer = { 1.0 /* gain */ }; -static DISCRETE_SOUND_START(bwidow) +static DISCRETE_SOUND_START(bwidow_discrete) /************************************************/ /* FINAL MIX */ @@ -130,7 +130,7 @@ static discrete_mixer_desc gravitar_mixer = { }; -static DISCRETE_SOUND_START(gravitar) +static DISCRETE_SOUND_START(gravitar_discrete) /************************************************/ /* FINAL MIX */ @@ -162,8 +162,7 @@ MACHINE_CONFIG_START(bwidow_state::bwidow_audio) MCFG_POKEY_OUTPUT_OPAMP(BW_R47, BW_C32, 5.0) MCFG_SOUND_ROUTE(0, "discrete", 1.0, 1) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(bwidow) + MCFG_DEVICE_ADD("discrete", DISCRETE, bwidow_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -176,5 +175,5 @@ MACHINE_CONFIG_START(bwidow_state::gravitar_audio) MCFG_POKEY_OUTPUT_OPAMP_LOW_PASS(BW_R51, GRAV_C34, 5.0) /* BW_C31 ignored */ MCFG_DEVICE_MODIFY("discrete") - MCFG_DISCRETE_INTF(gravitar) + MCFG_DISCRETE_INTF(gravitar_discrete) MACHINE_CONFIG_END diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index cf7d7f00b37..b5a912b3b0c 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -277,7 +277,7 @@ DISCRETE_RESET(bzone_custom_filter) * *************************************/ -static DISCRETE_SOUND_START(bzone) +static DISCRETE_SOUND_START(bzone_discrete) /************************************************/ /* Input register mapping for Battlezone */ @@ -406,8 +406,7 @@ MACHINE_CONFIG_START(bzone_state::bzone_audio) MCFG_POKEY_OUTPUT_RC(RES_K(10), CAP_U(0.015), 5.0) MCFG_SOUND_ROUTE(0, "discrete", 1.0, 0) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(bzone) + MCFG_DEVICE_ADD("discrete", DISCRETE, bzone_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/canyon.cpp b/src/mame/audio/canyon.cpp index 7e65dc0f6cd..2819659e030 100644 --- a/src/mame/audio/canyon.cpp +++ b/src/mame/audio/canyon.cpp @@ -62,7 +62,7 @@ static const discrete_lfsr_desc canyon_lfsr = #define CANYON_WHISTLESND2 NODE_14 #define CANYON_NOISE NODE_15 -DISCRETE_SOUND_START(canyon) +DISCRETE_SOUND_START(canyon_discrete) /************************************************/ /* Canyon sound system: 5 Sound Sources */ /* Relative Volume */ diff --git a/src/mame/audio/circus.cpp b/src/mame/audio/circus.cpp index c8bc072f69d..b589d1ccc5a 100644 --- a/src/mame/audio/circus.cpp +++ b/src/mame/audio/circus.cpp @@ -47,7 +47,7 @@ const char *const robotbwl_sample_names[] = /* Nodes - Sounds */ #define CIRCUS_MUSIC_SND NODE_10 -DISCRETE_SOUND_START(circus) +DISCRETE_SOUND_START(circus_discrete) /************************************************/ /* Input register mapping for circus */ /************************************************/ @@ -94,7 +94,7 @@ static const discrete_555_desc crash_beeper_555a = #define CRASH_MUSIC_SND NODE_20 #define CRASH_BEEPER_SND NODE_21 -DISCRETE_SOUND_START(crash) +DISCRETE_SOUND_START(crash_discrete) /************************************************/ /* Input register mapping for crash */ /************************************************/ @@ -129,7 +129,7 @@ DISCRETE_SOUND_END /* Nodes - Sounds */ #define ROBOTBWL_MUSIC_SND NODE_10 -DISCRETE_SOUND_START(robotbwl) +DISCRETE_SOUND_START(robotbwl_discrete) /************************************************/ /* Input register mapping for robotbwl */ /************************************************/ diff --git a/src/mame/audio/cliffhgr.cpp b/src/mame/audio/cliffhgr.cpp index 2fdc02ca88e..ac64627f5eb 100644 --- a/src/mame/audio/cliffhgr.cpp +++ b/src/mame/audio/cliffhgr.cpp @@ -28,9 +28,8 @@ static const discrete_mixer_desc desc_cliffhgr_mixer = 8 }; -DISCRETE_SOUND_EXTERN(cliffhgr); -DISCRETE_SOUND_START(cliffhgr) +DISCRETE_SOUND_START(cliffhgr_discrete) DISCRETE_INPUT_LOGIC(CLIFF_ENABLE_SND_1) DISCRETE_INPUT_LOGIC(CLIFF_ENABLE_SND_2) diff --git a/src/mame/audio/cliffhgr.h b/src/mame/audio/cliffhgr.h index 340b043debe..8c2bf06b297 100644 --- a/src/mame/audio/cliffhgr.h +++ b/src/mame/audio/cliffhgr.h @@ -7,6 +7,6 @@ #include "sound/discrete.h" -DISCRETE_SOUND_EXTERN( cliffhgr ); +DISCRETE_SOUND_EXTERN( cliffhgr_discrete ); #endif // MAME_AUDIO_CLIFFHGR_H diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp index 986537bb7db..0b4e04eb07a 100644 --- a/src/mame/audio/copsnrob.cpp +++ b/src/mame/audio/copsnrob.cpp @@ -590,7 +590,7 @@ DISCRETE_RESET(copsnrob_zings_555_astable) ************************************************/ -static DISCRETE_SOUND_START(copsnrob) +static DISCRETE_SOUND_START(copsnrob_discrete) /************************************************ * Input register mapping @@ -699,8 +699,7 @@ MACHINE_CONFIG_START(copsnrob_state::copsnrob_audio) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(copsnrob) + MCFG_DEVICE_ADD("discrete", DISCRETE, copsnrob_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp index 8ed2352e89c..4e1e15d6590 100644 --- a/src/mame/audio/crbaloon.cpp +++ b/src/mame/audio/crbaloon.cpp @@ -89,7 +89,7 @@ static const discrete_dac_r1_ladder desc_crbaloon_music_dac = -static DISCRETE_SOUND_START(crbaloon) +static DISCRETE_SOUND_START(crbaloon_discrete) /************************************************ * Input register mapping @@ -158,7 +158,6 @@ MACHINE_CONFIG_START(crbaloon_state::crbaloon_audio) MCFG_SN76477_ENABLE(0) // enable MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(crbaloon) + MCFG_DEVICE_ADD("discrete", DISCRETE, crbaloon_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 70e06f7b597..490248e6ef6 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -342,7 +342,7 @@ DISCRETE_RESET( dkong_custom_mixer ) #endif -static DISCRETE_SOUND_START(dkong2b) +static DISCRETE_SOUND_START(dkong2b_discrete) /************************************************/ /* Input register mapping for dkong */ @@ -620,7 +620,7 @@ static const discrete_dss_inverter_osc_node::description radarscp_inverter_osc_d discrete_dss_inverter_osc_node::IS_TYPE3 }; -static DISCRETE_SOUND_START(radarscp) +static DISCRETE_SOUND_START(radarscp_discrete) /************************************************/ /* Input register mapping for radarscp */ @@ -853,7 +853,7 @@ static const discrete_lfsr_desc dkongjr_lfsr = #define DS_SOUND9_EN DS_SOUND9_INV -static DISCRETE_SOUND_START(dkongjr) +static DISCRETE_SOUND_START(dkongjr_discrete) /************************************************/ /* Input register mapping for dkongjr */ @@ -1353,14 +1353,14 @@ MACHINE_CONFIG_START(dkong_state::dkong2b_audio) MCFG_MCS48_PORT_T1_IN_CB(READLINE("ls259.6h", latch8_device, bit4_q_r)) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DISCRETE_ADD("discrete", 0, dkong2b) + MCFG_DEVICE_ADD("discrete", DISCRETE, dkong2b_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::radarscp_audio) dkong2b_audio(config); - MCFG_DISCRETE_REPLACE("discrete", 0, radarscp) + MCFG_DEVICE_REPLACE("discrete", DISCRETE, radarscp_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.7) MACHINE_CONFIG_END @@ -1427,7 +1427,7 @@ MACHINE_CONFIG_START(dkong_state::dkongjr_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DISCRETE_ADD("discrete", 0, dkongjr) + MCFG_DEVICE_ADD("discrete", DISCRETE, dkongjr_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/dragrace.cpp b/src/mame/audio/dragrace.cpp index c4de9473287..5c84331ce4e 100644 --- a/src/mame/audio/dragrace.cpp +++ b/src/mame/audio/dragrace.cpp @@ -40,7 +40,7 @@ static const discrete_lfsr_desc dragrace_lfsr = #define DRAGRACE_MOTOR1_SND NODE_18 #define DRAGRACE_MOTOR2_SND NODE_19 -DISCRETE_SOUND_START(dragrace) +DISCRETE_SOUND_START(dragrace_discrete) /************************************************/ /* dragrace Effects Relataive Gain Table */ /* */ diff --git a/src/mame/audio/firetrk.cpp b/src/mame/audio/firetrk.cpp index 74269247cf4..562423e5391 100644 --- a/src/mame/audio/firetrk.cpp +++ b/src/mame/audio/firetrk.cpp @@ -180,7 +180,7 @@ static const discrete_mixer_desc firetrk_mixer = #define FIRETRUCK_BELLSND NODE_17 #define FIRETRUCK_XTNDPLYSND NODE_18 -DISCRETE_SOUND_START(firetrk) +DISCRETE_SOUND_START(firetrk_discrete) /************************************************/ /* Input register mapping for firetruck */ /************************************************/ @@ -387,7 +387,7 @@ static const discrete_mixer_desc superbug_mixer = #define SUPERBUG_SCREECHSND NODE_13 #define SUPERBUG_ASRSND NODE_14 -DISCRETE_SOUND_START(superbug) +DISCRETE_SOUND_START(superbug_discrete) /************************************************/ /* Input register mapping for superbug */ /************************************************/ @@ -568,7 +568,7 @@ static const discrete_mixer_desc montecar_mixer = #define MONTECAR_BANGSND NODE_13 #define MONTECAR_SCREECHSND NODE_14 -DISCRETE_SOUND_START(montecar) +DISCRETE_SOUND_START(montecar_discrete) /************************************************/ /* Input register mapping for montecar */ /************************************************/ diff --git a/src/mame/audio/galaga.cpp b/src/mame/audio/galaga.cpp index de76a62ba13..03bd0d4e3ac 100644 --- a/src/mame/audio/galaga.cpp +++ b/src/mame/audio/galaga.cpp @@ -127,7 +127,7 @@ static const discrete_mixer_desc bosco_final_mixer = 462000 /* gain */ }; -DISCRETE_SOUND_START(bosco) +DISCRETE_SOUND_START(bosco_discrete) /************************************************ * Input register mapping @@ -307,7 +307,7 @@ static const discrete_mixer_desc galaga_final_mixer = 40800, /* gain */ }; -DISCRETE_SOUND_START(galaga) +DISCRETE_SOUND_START(galaga_discrete) /************************************************ * Input register mapping diff --git a/src/mame/audio/galaxian.cpp b/src/mame/audio/galaxian.cpp index ec0e9fc6801..bdb4d18816c 100644 --- a/src/mame/audio/galaxian.cpp +++ b/src/mame/audio/galaxian.cpp @@ -244,7 +244,7 @@ static const discrete_op_amp_filt_info galaxian_bandpass_desc = *************************************/ -static DISCRETE_SOUND_START(galaxian) +static DISCRETE_SOUND_START(galaxian_discrete) /************************************************/ /* Input register mapping for galaxian */ @@ -376,8 +376,8 @@ static DISCRETE_SOUND_START(galaxian) DISCRETE_SOUND_END -static DISCRETE_SOUND_START(mooncrst) - DISCRETE_IMPORT(galaxian) +static DISCRETE_SOUND_START(mooncrst_discrete) + DISCRETE_IMPORT(galaxian_discrete) /************************************************/ /* Moon Cresta mixing stage */ @@ -501,8 +501,7 @@ MACHINE_CONFIG_START(galaxold_state::galaxian_audio) MCFG_DEVICE_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE) - MCFG_DISCRETE_INTF(galaxian) + MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, galaxian_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END @@ -511,8 +510,7 @@ MACHINE_CONFIG_START(galaxold_state::mooncrst_audio) MCFG_DEVICE_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE) - MCFG_DISCRETE_INTF(mooncrst) + MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, mooncrst_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END @@ -522,8 +520,7 @@ MACHINE_CONFIG_START(galaxian_state::galaxian_audio) MCFG_DEVICE_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE) - MCFG_DISCRETE_INTF(galaxian) + MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, galaxian_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END @@ -532,8 +529,6 @@ MACHINE_CONFIG_START(galaxian_state::mooncrst_audio) MCFG_DEVICE_ADD("cust", GALAXIAN, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.4) - MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE) - MCFG_DISCRETE_INTF(mooncrst) - + MCFG_DEVICE_ADD(GAL_AUDIO, DISCRETE, mooncrst_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/grchamp.cpp b/src/mame/audio/grchamp.cpp index c4600a957ac..729fc9fe9d4 100644 --- a/src/mame/audio/grchamp.cpp +++ b/src/mame/audio/grchamp.cpp @@ -36,7 +36,7 @@ static const discrete_dac_r1_ladder grchamp_sound_dac2 = /* Nodes - Sounds */ -DISCRETE_SOUND_START(grchamp) +DISCRETE_SOUND_START(grchamp_discrete) /************************************************/ /* Input register mapping for grand champion */ diff --git a/src/mame/audio/hitme.cpp b/src/mame/audio/hitme.cpp index 1a7ed091c42..10ab8b0c698 100644 --- a/src/mame/audio/hitme.cpp +++ b/src/mame/audio/hitme.cpp @@ -35,7 +35,7 @@ static const discrete_comp_adder_table desc_hitme_adder = #define HITME_FINAL_SND NODE_90 -DISCRETE_SOUND_START(hitme) +DISCRETE_SOUND_START(hitme_discrete) /* These are the inputs; PULSE-type inputs are used for oneshot latching signals */ DISCRETE_INPUT_DATA (HITME_DOWNCOUNT_VAL) diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 3b0dc6844ba..5187c93c814 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -321,7 +321,7 @@ static const discrete_mixer_desc m52_sound_c_mix1 = CAP_U(1), /* cAmp */ 0, 1}; -static DISCRETE_SOUND_START( m52_sound_c ) +static DISCRETE_SOUND_START( m52_sound_c_discrete ) /* Chip AY8910/1 */ DISCRETE_INPUTX_STREAM(NODE_01, 0, 1.0, 0) @@ -502,8 +502,7 @@ MACHINE_CONFIG_START(m52_soundc_audio_device::device_add_mconfig) MCFG_MSM5205_PRESCALER_SELECTOR(S96_4B) /* default to 4KHz, but can be changed at run time */ MCFG_SOUND_ROUTE(0, "filtermix", 1.0, 2) - MCFG_DEVICE_ADD("filtermix", DISCRETE) - MCFG_DISCRETE_INTF(m52_sound_c) + MCFG_DEVICE_ADD("filtermix", DISCRETE, m52_sound_c_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/llander.cpp b/src/mame/audio/llander.cpp index 1a35dc7c443..b29eb4dba67 100644 --- a/src/mame/audio/llander.cpp +++ b/src/mame/audio/llander.cpp @@ -41,7 +41,7 @@ static const discrete_lfsr_desc llander_lfsr = 14 /* Output bit */ }; -static DISCRETE_SOUND_START(llander) +static DISCRETE_SOUND_START(llander_discrete) /************************************************/ /* llander Effects Relataive Gain Table */ /* */ @@ -101,7 +101,6 @@ WRITE8_MEMBER(asteroid_state::llander_sounds_w) MACHINE_CONFIG_START(asteroid_state::llander_sound) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(llander) + MCFG_DEVICE_ADD("discrete", DISCRETE, llander_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/m79amb.cpp b/src/mame/audio/m79amb.cpp index f826e091533..0d989b357d0 100644 --- a/src/mame/audio/m79amb.cpp +++ b/src/mame/audio/m79amb.cpp @@ -136,7 +136,7 @@ static const discrete_mixer_desc m79amb_final_mix = 1 /* gain */ }; -DISCRETE_SOUND_START( m79amb ) +DISCRETE_SOUND_START( m79amb_discrete ) /************************************************ * Input register mapping ************************************************/ diff --git a/src/mame/audio/madalien.cpp b/src/mame/audio/madalien.cpp index 59990445d3e..067330ee24a 100644 --- a/src/mame/audio/madalien.cpp +++ b/src/mame/audio/madalien.cpp @@ -126,7 +126,7 @@ static const discrete_mixer_desc madalien_final_mix = 32768.0/DEFAULT_TTL_V_LOGIC_1 // final gain }; -DISCRETE_SOUND_START( madalien ) +DISCRETE_SOUND_START( madalien_discrete ) /************************************************ * Input register mapping ************************************************/ diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index 31aa82269a6..07d13d2c313 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -148,7 +148,7 @@ #define LS629_FREQ_R_IN RES_K(90) -static DISCRETE_SOUND_START(mario) +static DISCRETE_SOUND_START(mario_discrete) /************************************************ * Input register mapping for mario diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index 1a3d4b602e4..a2b64a7da4b 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -276,7 +276,7 @@ WRITE8_MEMBER(mw8080bw_state::gunfight_audio_w) #define TORNBASE_TONE_SND_FILT NODE_11 -static DISCRETE_SOUND_START(tornbase) +static DISCRETE_SOUND_START(tornbase_discrete) /* the 3 enable lines coming out of the 74175 flip-flop at G5 */ DISCRETE_INPUT_LOGIC(TORNBASE_TONE_240_EN) /* pin 2 */ @@ -309,8 +309,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::tornbase_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(tornbase) + MCFG_DEVICE_ADD("discrete", DISCRETE, tornbase_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) MACHINE_CONFIG_END @@ -462,7 +461,7 @@ static const discrete_op_amp_osc_info maze_op_amp_osc = }; -static DISCRETE_SOUND_START(maze) +static DISCRETE_SOUND_START(maze_discrete) /************************************************ * Input register mapping @@ -555,8 +554,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::maze_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(maze) + MCFG_DEVICE_ADD("discrete", DISCRETE, maze_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -730,7 +728,7 @@ static const discrete_mixer_desc boothill_r_mixer = }; -static DISCRETE_SOUND_START(boothill) +static DISCRETE_SOUND_START(boothill_discrete) /************************************************ * Input register mapping @@ -802,8 +800,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::boothill_audio) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(boothill) + MCFG_DEVICE_ADD("discrete", DISCRETE, boothill_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -934,7 +931,7 @@ static const discrete_mixer_desc checkmat_mixer = 1 /* gain */ }; -static DISCRETE_SOUND_START(checkmat) +static DISCRETE_SOUND_START(checkmat_discrete) /************************************************ * Input register mapping @@ -1032,8 +1029,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::checkmat_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(checkmat) + MCFG_DEVICE_ADD("discrete", DISCRETE, checkmat_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MACHINE_CONFIG_END @@ -1173,7 +1169,7 @@ static const discrete_mixer_desc desertgu_mixer = }; -static DISCRETE_SOUND_START(desertgu) +static DISCRETE_SOUND_START(desertgu_discrete) /************************************************ * Input register mapping @@ -1243,8 +1239,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::desertgu_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(desertgu) + MCFG_DEVICE_ADD("discrete", DISCRETE, desertgu_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MACHINE_CONFIG_END @@ -1441,7 +1436,7 @@ static const discrete_mixer_desc dplay_mixer = }; -static DISCRETE_SOUND_START(dplay) +static DISCRETE_SOUND_START(dplay_discrete) /************************************************ * Input register mapping @@ -1508,8 +1503,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::dplay_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(dplay) + MCFG_DEVICE_ADD("discrete", DISCRETE, dplay_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MACHINE_CONFIG_END @@ -1831,7 +1825,7 @@ static const discrete_mixer_desc clowns_mixer = }; -static DISCRETE_SOUND_START(clowns) +static DISCRETE_SOUND_START(clowns_discrete) /************************************************ * Input register mapping @@ -1905,8 +1899,7 @@ MACHINE_CONFIG_START(mw8080bw_state::clowns_audio) MCFG_SAMPLES_NAMES(clowns_sample_names) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(clowns) + MCFG_DEVICE_ADD("discrete", DISCRETE, clowns_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -2158,7 +2151,7 @@ DISCRETE_FILTER2(NODE_RELATIVE(NODE_37, _num), DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1), \ NODE_RELATIVE(NODE_37, _num), 0.5) - static DISCRETE_SOUND_START(spacwalk) + static DISCRETE_SOUND_START(spacwalk_discrete) /************************************************ * Input register mapping @@ -2271,8 +2264,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::spacwalk_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(spacwalk) + MCFG_DEVICE_ADD("discrete", DISCRETE, spacwalk_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2424,7 +2416,7 @@ static const discrete_mixer_desc shuffle_mixer = }; -static DISCRETE_SOUND_START(shuffle) +static DISCRETE_SOUND_START(shuffle_discrete) DISCRETE_INPUT_LOGIC(SHUFFLE_ROLLING_1_EN) DISCRETE_INPUT_LOGIC(SHUFFLE_ROLLING_2_EN) DISCRETE_INPUT_LOGIC(SHUFFLE_ROLLING_3_EN) @@ -2500,8 +2492,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::shuffle_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(shuffle) + MCFG_DEVICE_ADD("discrete", DISCRETE, shuffle_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2622,7 +2613,7 @@ static const discrete_mixer_desc dogpatch_r_mixer = }; -static DISCRETE_SOUND_START(dogpatch) +static DISCRETE_SOUND_START(dogpatch_discrete) /************************************************ * Input register mapping ************************************************/ @@ -2679,8 +2670,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::dogpatch_audio) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(dogpatch) + MCFG_DEVICE_ADD("discrete", DISCRETE, dogpatch_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -2969,7 +2959,7 @@ static const discrete_mixer_desc spcenctr_mixer = }; -static DISCRETE_SOUND_START(spcenctr) +static DISCRETE_SOUND_START(spcenctr_discrete) /************************************************ * Input register mapping @@ -3201,8 +3191,7 @@ MACHINE_CONFIG_START(mw8080bw_state::spcenctr_audio) MCFG_SN76477_ENABLE(1) // enable MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(spcenctr) + MCFG_DEVICE_ADD("discrete", DISCRETE, spcenctr_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) MACHINE_CONFIG_END @@ -3364,7 +3353,7 @@ static const discrete_op_amp_tvca_info bowler_fowl_tvca = }; -static DISCRETE_SOUND_START(bowler) +static DISCRETE_SOUND_START(bowler_discrete) /************************************************ * Input register mapping @@ -3401,8 +3390,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::bowler_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(bowler) + MCFG_DEVICE_ADD("discrete", DISCRETE, bowler_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) MACHINE_CONFIG_END @@ -4083,7 +4071,7 @@ static const discrete_mixer_desc invaders_mixer = /* Schematic M051-00739-A005 and M051-00739-B005 */ /* P.C. A084-90700-B000 and A084-90700-C000 */ -static DISCRETE_SOUND_START(invaders) +static DISCRETE_SOUND_START(invaders_discrete) INVADERS_NOISE_GENERATOR INVADERS_SAUCER_HIT(1) INVADERS_FLEET(1) @@ -4114,8 +4102,7 @@ MACHINE_CONFIG_START(mw8080bw_state::invaders_audio) MCFG_SN76477_ENABLE(1) // enable MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(invaders) + MCFG_DEVICE_ADD("discrete", DISCRETE, invaders_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_CONFIG_END @@ -4387,7 +4374,7 @@ static const discrete_mixer_desc blueshrk_mixer = 0, 0, 0, BLUESHRK_C900, 0, 1 /* rI, rF, cF, cAmp, vRef, gain */ }; -static DISCRETE_SOUND_START(blueshrk) +static DISCRETE_SOUND_START(blueshrk_discrete) /************************************************ * Input register mapping @@ -4515,8 +4502,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::blueshrk_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(blueshrk) + MCFG_DEVICE_ADD("discrete", DISCRETE, blueshrk_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -4649,7 +4635,7 @@ static const discrete_mixer_desc invad2ct_mixer = }; -static DISCRETE_SOUND_START(invad2ct) +static DISCRETE_SOUND_START(invad2ct_discrete) /* sound board 1 */ /* P.C. A082-90700-A000 */ /* Schematic M051-00851-A002 */ @@ -4678,8 +4664,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::invad2ct_audio) MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(invad2ct) + MCFG_DEVICE_ADD("discrete", DISCRETE, invad2ct_discrete) MCFG_SOUND_ROUTE(0, "spk1", 0.5) MCFG_SOUND_ROUTE(1, "spk2", 0.5) diff --git a/src/mame/audio/nitedrvr.cpp b/src/mame/audio/nitedrvr.cpp index e3a0c5000a7..a005627758a 100644 --- a/src/mame/audio/nitedrvr.cpp +++ b/src/mame/audio/nitedrvr.cpp @@ -34,7 +34,7 @@ static const discrete_lfsr_desc nitedrvr_lfsr = #define NITEDRVR_SCREECH1_SND NODE_13 #define NITEDRVR_SCREECH2_SND NODE_14 -DISCRETE_SOUND_START(nitedrvr) +DISCRETE_SOUND_START(nitedrvr_discrete) /************************************************/ /* nitedrvr Effects Relataive Gain Table */ /* */ diff --git a/src/mame/audio/norautp.cpp b/src/mame/audio/norautp.cpp index 73eaf1fa12b..b0a6af312f2 100644 --- a/src/mame/audio/norautp.cpp +++ b/src/mame/audio/norautp.cpp @@ -30,7 +30,7 @@ static const discrete_comp_adder_table desc_##_name##_caps = \ } \ }; \ \ -DISCRETE_SOUND_START( _name ) \ +DISCRETE_SOUND_START( _name##_discrete ) \ /************************************************ \ * Input register mapping \ ************************************************/ \ diff --git a/src/mame/audio/orbit.cpp b/src/mame/audio/orbit.cpp index 2deacd5afb3..47d5eee7051 100644 --- a/src/mame/audio/orbit.cpp +++ b/src/mame/audio/orbit.cpp @@ -65,7 +65,7 @@ static const discrete_lfsr_desc orbit_lfsr = #define ORBIT_ANOTE2_SND NODE_14 #define ORBIT_WARNING_SND NODE_15 -DISCRETE_SOUND_START(orbit) +DISCRETE_SOUND_START(orbit_discrete) /************************************************/ /* orbit Effects Relataive Gain Table */ /* */ diff --git a/src/mame/audio/phoenix.cpp b/src/mame/audio/phoenix.cpp index 6f057b194d3..7b7fd0d4915 100644 --- a/src/mame/audio/phoenix.cpp +++ b/src/mame/audio/phoenix.cpp @@ -341,7 +341,7 @@ static const discrete_mixer_desc phoenix_mixer = #define PHOENIX_EFFECT_4_SND 0 -DISCRETE_SOUND_START(phoenix) +DISCRETE_SOUND_START(phoenix_discrete) /************************************************/ /* Input register mapping for phoenix */ /************************************************/ diff --git a/src/mame/audio/phoenix.h b/src/mame/audio/phoenix.h index 1492f39d227..c59d8fb1640 100644 --- a/src/mame/audio/phoenix.h +++ b/src/mame/audio/phoenix.h @@ -57,6 +57,6 @@ private: DECLARE_DEVICE_TYPE(PHOENIX_SOUND, phoenix_sound_device) -DISCRETE_SOUND_EXTERN(phoenix); +DISCRETE_SOUND_EXTERN(phoenix_discrete); #endif // MAME_AUDIO_PHOENIX_H diff --git a/src/mame/audio/polepos.cpp b/src/mame/audio/polepos.cpp index ee706143f4e..f911dd2ae2e 100644 --- a/src/mame/audio/polepos.cpp +++ b/src/mame/audio/polepos.cpp @@ -421,7 +421,7 @@ static const discrete_op_amp_filt_info polepos_chanl3_filt = }; -DISCRETE_SOUND_START(polepos) +DISCRETE_SOUND_START(polepos_discrete) /************************************************ * Input register mapping diff --git a/src/mame/audio/polepos.h b/src/mame/audio/polepos.h index 6fe6f12e710..97b954921ad 100644 --- a/src/mame/audio/polepos.h +++ b/src/mame/audio/polepos.h @@ -52,6 +52,6 @@ private: DECLARE_DEVICE_TYPE(POLEPOS_SOUND, polepos_sound_device) -DISCRETE_SOUND_EXTERN( polepos ); +DISCRETE_SOUND_EXTERN( polepos_discrete ); #endif // MAME_AUDIO_POLEPOS_H diff --git a/src/mame/audio/poolshrk.cpp b/src/mame/audio/poolshrk.cpp index 2f030135d3a..ab4ca35ff5c 100644 --- a/src/mame/audio/poolshrk.cpp +++ b/src/mame/audio/poolshrk.cpp @@ -55,7 +55,7 @@ static const discrete_mixer_desc poolshrk_mixer = #define POOLSHRK_CLICK_SND NODE_12 #define POOLSHRK_SCORE_SND NODE_13 -DISCRETE_SOUND_START(poolshrk) +DISCRETE_SOUND_START(poolshrk_discrete) /************************************************/ /* Input register mapping for poolshrk */ /************************************************/ diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index fcd9a2128e1..4d9c8543501 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -59,7 +59,7 @@ static const discrete_comp_adder_table qix_attn_table = {RES_K(22)+250, RES_K(10)+250, RES_K(5.6)+250, RES_K(3.3)+250} }; -static DISCRETE_SOUND_START(qix) +static DISCRETE_SOUND_START(qix_discrete) /* NODE */ DISCRETE_INPUTX_DATA(QIX_DAC_DATA, 128, -128*128, 128) DISCRETE_INPUT_DATA (QIX_VOL_DATA) @@ -198,8 +198,7 @@ MACHINE_CONFIG_START(qix_state::qix_audio) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(qix) + MCFG_DEVICE_ADD("discrete", DISCRETE, qix_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/skydiver.cpp b/src/mame/audio/skydiver.cpp index 33377f6fe21..dc1a303d9de 100644 --- a/src/mame/audio/skydiver.cpp +++ b/src/mame/audio/skydiver.cpp @@ -43,7 +43,7 @@ static const discrete_lfsr_desc skydiver_lfsr = #define SKYDIVER_WHISTLE1_SND NODE_13 #define SKYDIVER_WHISTLE2_SND NODE_14 -DISCRETE_SOUND_START(skydiver) +DISCRETE_SOUND_START(skydiver_discrete) /************************************************/ /* skydiver Effects Relative Gain Table */ /* */ diff --git a/src/mame/audio/skyraid.cpp b/src/mame/audio/skyraid.cpp index faf3d1e254e..75e9eac3397 100644 --- a/src/mame/audio/skyraid.cpp +++ b/src/mame/audio/skyraid.cpp @@ -184,7 +184,7 @@ DISCRETE_RESET( skyraid_missle_custom_charge ) -DISCRETE_SOUND_START( skyraid ) +DISCRETE_SOUND_START( skyraid_discrete ) /************************************************ * Input register mapping ************************************************/ diff --git a/src/mame/audio/snk6502.cpp b/src/mame/audio/snk6502.cpp index 62c644f6e6e..c08fd88880d 100644 --- a/src/mame/audio/snk6502.cpp +++ b/src/mame/audio/snk6502.cpp @@ -108,7 +108,7 @@ static const discrete_op_amp_filt_info fantasy_filter = #define FANTASY_NOISE_STREAM_IN NODE_02 #define FANTASY_NOISE_LOGIC NODE_03 -DISCRETE_SOUND_START( fantasy ) +DISCRETE_SOUND_START( fantasy_discrete ) DISCRETE_INPUT_LOGIC (FANTASY_BOMB_EN) DISCRETE_INPUT_STREAM(FANTASY_NOISE_STREAM_IN, 0) diff --git a/src/mame/audio/snk6502.h b/src/mame/audio/snk6502.h index bd03457376e..195135b47b5 100644 --- a/src/mame/audio/snk6502.h +++ b/src/mame/audio/snk6502.h @@ -77,7 +77,7 @@ private: DECLARE_DEVICE_TYPE(SNK6502, snk6502_sound_device) -DISCRETE_SOUND_EXTERN( fantasy ); +DISCRETE_SOUND_EXTERN( fantasy_discrete ); extern char const *const sasuke_sample_names[]; extern char const *const vanguard_sample_names[]; diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index ffd8f774133..03b736c8455 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -110,7 +110,7 @@ static const discrete_555_desc spiders_super_web_555a = #define SPIDERS_SW NODE_13 #define SPIDERS_X NODE_14 -static DISCRETE_SOUND_START(spiders) +static DISCRETE_SOUND_START(spiders_discrete) /************************************************/ /* Input register mapping for spiders */ @@ -208,7 +208,6 @@ WRITE8_MEMBER(spiders_state::spiders_audio_ctrl_w) MACHINE_CONFIG_START(spiders_state::spiders_audio) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(spiders) + MCFG_DEVICE_ADD("discrete", DISCRETE, spiders_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/sprint2.cpp b/src/mame/audio/sprint2.cpp index f0f7df6925e..b5cff7b1946 100644 --- a/src/mame/audio/sprint2.cpp +++ b/src/mame/audio/sprint2.cpp @@ -102,7 +102,7 @@ static const discrete_mixer_desc sprint2_mixer = #define SPRINT2_1V SPRINT2_HSYNC/2 #define SPRINT2_2V SPRINT2_1V/2 -DISCRETE_SOUND_START(sprint2) +DISCRETE_SOUND_START(sprint2_discrete) /************************************************/ /* Input register mapping for sprint2 */ @@ -227,7 +227,7 @@ DISCRETE_SOUND_START(sprint2) DISCRETE_SOUND_END -DISCRETE_SOUND_START(sprint1) +DISCRETE_SOUND_START(sprint1_discrete) /************************************************/ /* Input register mapping for sprint1 */ @@ -361,7 +361,7 @@ static const discrete_mixer_desc dominos_mixer = /* Nodes - Adjusters */ #define DOMINOS_R23 NODE_15 -DISCRETE_SOUND_START(dominos) +DISCRETE_SOUND_START(dominos_discrete) /************************************************/ /* Input register mapping for dominos */ /************************************************/ diff --git a/src/mame/audio/sprint4.cpp b/src/mame/audio/sprint4.cpp index 5a8aef449e1..51e86a9b72b 100644 --- a/src/mame/audio/sprint4.cpp +++ b/src/mame/audio/sprint4.cpp @@ -276,7 +276,7 @@ static const discrete_mixer_desc sprint4_mixer = -DISCRETE_SOUND_START(sprint4) +DISCRETE_SOUND_START(sprint4_discrete) SPRINT4_ATTRACT SPRINT4_PLAYER_MOTOR(1) SPRINT4_PLAYER_MOTOR(2) @@ -292,7 +292,7 @@ DISCRETE_SOUND_START(sprint4) DISCRETE_SOUND_END -DISCRETE_SOUND_START(ultratnk) +DISCRETE_SOUND_START(ultratnk_discrete) SPRINT4_ATTRACT SPRINT4_PLAYER_MOTOR(1) SPRINT4_PLAYER_MOTOR(2) diff --git a/src/mame/audio/sprint4.h b/src/mame/audio/sprint4.h index 855e919c725..bec2100eee8 100644 --- a/src/mame/audio/sprint4.h +++ b/src/mame/audio/sprint4.h @@ -29,5 +29,5 @@ Atari Sprint 4 + Ultra Tank Audio /*----------- defined in audio/sprint4.c -----------*/ -DISCRETE_SOUND_EXTERN( sprint4 ); -DISCRETE_SOUND_EXTERN( ultratnk ); +DISCRETE_SOUND_EXTERN( sprint4_discrete ); +DISCRETE_SOUND_EXTERN( ultratnk_discrete ); diff --git a/src/mame/audio/sprint8.cpp b/src/mame/audio/sprint8.cpp index ca6d63fa30b..5339365152a 100644 --- a/src/mame/audio/sprint8.cpp +++ b/src/mame/audio/sprint8.cpp @@ -169,7 +169,7 @@ DISCRETE_555_MSTABLE(NODE_RELATIVE(NODE_60, _car - 1), 1, NODE_RELATIVE(NODE_50, DISCRETE_OP_AMP_FILTER(NODE_RELATIVE(SPRINT8_MOTOR1_SND, _car - 1), 1, NODE_RELATIVE(NODE_60, _car - 1), 0, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &sprint8_motor_filter) -DISCRETE_SOUND_START( sprint8 ) +DISCRETE_SOUND_START( sprint8_discrete ) /************************************************ * Input register mapping ************************************************/ @@ -305,8 +305,7 @@ MACHINE_CONFIG_START(sprint8_state::sprint8_audio) MCFG_SPEAKER_ADD("speaker_5_6", 0.0, 0.0, -0.5) /* back */ MCFG_SPEAKER_ADD("speaker_4_8", 0.2, 0.0, 1.0) /* right */ - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(sprint8) + MCFG_DEVICE_ADD("discrete", DISCRETE, sprint8_discrete) 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/audio/starshp1.cpp b/src/mame/audio/starshp1.cpp index b9f58ada159..f236ae5faab 100644 --- a/src/mame/audio/starshp1.cpp +++ b/src/mame/audio/starshp1.cpp @@ -145,7 +145,7 @@ static const discrete_mixer_desc starshp1_final_mix = }; -DISCRETE_SOUND_START( starshp1 ) +DISCRETE_SOUND_START( starshp1_discrete ) /************************************************ * Input register mapping ************************************************/ diff --git a/src/mame/audio/subs.cpp b/src/mame/audio/subs.cpp index 40d58bdddfb..cb550ec12a5 100644 --- a/src/mame/audio/subs.cpp +++ b/src/mame/audio/subs.cpp @@ -48,7 +48,7 @@ static const discrete_lfsr_desc subs_lfsr = #define SUBS_CRASH_SND NODE_14 #define SUBS_EXPLODE_SND NODE_15 -DISCRETE_SOUND_START(subs) +DISCRETE_SOUND_START(subs_discrete) /************************************************/ /* subs Effects Relataive Gain Table */ /* */ diff --git a/src/mame/audio/tank8.cpp b/src/mame/audio/tank8.cpp index 506bded19da..4db13355148 100644 --- a/src/mame/audio/tank8.cpp +++ b/src/mame/audio/tank8.cpp @@ -113,7 +113,7 @@ static const discrete_dac_r1_ladder tank8_dac = #define TANK8_A2_LINE NODE_26 -DISCRETE_SOUND_START(tank8) +DISCRETE_SOUND_START(tank8_discrete) /************************************************/ /* Tank8 sound system: 10 Sound Sources */ /* Motor 1-8 */ diff --git a/src/mame/audio/triplhnt.cpp b/src/mame/audio/triplhnt.cpp index ccd478ceb10..d0ddba719d2 100644 --- a/src/mame/audio/triplhnt.cpp +++ b/src/mame/audio/triplhnt.cpp @@ -105,7 +105,7 @@ static const discrete_mixer_desc triplhnt_mixer = #define TRIPLHNT_SCREECH_SND NODE_13 #define POOLSHRK_SCORE_SND NODE_14 -DISCRETE_SOUND_START(triplhnt) +DISCRETE_SOUND_START(triplhnt_discrete) /************************************************/ /* Input register mapping for triplhnt */ /************************************************/ diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp index da93ff07c2c..f430001a7ad 100644 --- a/src/mame/audio/turbo.cpp +++ b/src/mame/audio/turbo.cpp @@ -616,7 +616,7 @@ static const discrete_555_desc turbo_alarm_555 = DEFAULT_555_VALUES, }; -DISCRETE_SOUND_START(turbo) +DISCRETE_SOUND_START(turbo_discrete) /************************************************/ /* Input register mapping for turbo */ /************************************************/ diff --git a/src/mame/audio/vicdual.cpp b/src/mame/audio/vicdual.cpp index cb2f72a1d18..1b2f6af170b 100644 --- a/src/mame/audio/vicdual.cpp +++ b/src/mame/audio/vicdual.cpp @@ -58,7 +58,7 @@ static const discrete_mixer_desc frogsMixer = 0, RES_K(56), 0, CAP_U(0.1), 0, 10000 }; -static DISCRETE_SOUND_START(frogs) +static DISCRETE_SOUND_START(frogs_discrete) /************************************************ * Input register mapping for frogs * @@ -117,8 +117,7 @@ MACHINE_CONFIG_START(vicdual_state::frogs_audio) MCFG_SAMPLES_NAMES(frogs_sample_names) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(frogs) + MCFG_DEVICE_ADD("discrete", DISCRETE, frogs_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -313,7 +312,7 @@ static const discrete_op_amp_filt_info headon_sallen_key_info = CAP_N(470), CAP_N(47), 0 }; -static DISCRETE_SOUND_START(headon) +static DISCRETE_SOUND_START(headon_discrete) /************************************************ * Input register mapping for headon * @@ -447,8 +446,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(vicdual_state::headon_audio) - MCFG_DEVICE_ADD("discrete", DISCRETE) - MCFG_DISCRETE_INTF(headon) + MCFG_DEVICE_ADD("discrete", DISCRETE, headon_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -507,7 +505,7 @@ WRITE8_MEMBER( vicdual_state::invho2_audio_w ) #define BRDRLINE_WALK_TRG_SND NODE_97 #define BRDRLINE_CRY_TRG_SND NODE_98 -DISCRETE_SOUND_START(brdrline) +DISCRETE_SOUND_START(brdrline_discrete) /************************************************ * Input register mapping ************************************************/ diff --git a/src/mame/audio/videopin.cpp b/src/mame/audio/videopin.cpp index 10d3c2c1aae..023cbd06377 100644 --- a/src/mame/audio/videopin.cpp +++ b/src/mame/audio/videopin.cpp @@ -20,7 +20,7 @@ #define VIDEOPIN_BELL_SND NODE_11 #define VIDEOPIN_BONG_SND NODE_12 -DISCRETE_SOUND_START(videopin) +DISCRETE_SOUND_START(videopin_discrete) /************************************************/ /* videopin Effects Relataive Gain Table */ /* */ |