diff options
author | Vas Crabb <vas@vastheman.com> | 2018-05-09 19:26:44 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-05-09 19:26:44 +1000 |
commit | 6c11b3ce0131be3b14edf5ef93fa9cb2380ae45b (patch) | |
tree | 07181df4c25bf034f38aa13cf19c4ee2995d3e7f /src/mame/audio | |
parent | be68e91d80f242ca173ba8009dd8c68dbc4b7b29 (diff) |
dsp16: fix condition mask in disassembler (nw)
(nw) remove more MCFG macros and make speaker config more explicit
Diffstat (limited to 'src/mame/audio')
39 files changed, 123 insertions, 102 deletions
diff --git a/src/mame/audio/alesis.cpp b/src/mame/audio/alesis.cpp index a49f25a6ecb..39fb0609fb6 100644 --- a/src/mame/audio/alesis.cpp +++ b/src/mame/audio/alesis.cpp @@ -42,8 +42,10 @@ alesis_dm3ag_device::alesis_dm3ag_device(const machine_config &mconfig, const ch //------------------------------------------------- MACHINE_CONFIG_START(alesis_dm3ag_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker1", "rspeaker1") - MCFG_SPEAKER_STANDARD_STEREO("lspeaker2", "rspeaker2") + SPEAKER(config, "lspeaker1").front_left(); + SPEAKER(config, "rspeaker1").front_right(); + SPEAKER(config, "lspeaker2").front_left(); + SPEAKER(config, "rspeaker2").front_right(); MCFG_DEVICE_ADD("dac", PCM54HP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker1", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker1", 1.0) // PCM54HP DAC + R63/R73-75 + Sample and hold MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) diff --git a/src/mame/audio/asteroid.cpp b/src/mame/audio/asteroid.cpp index afcb68898bf..5abe45484c3 100644 --- a/src/mame/audio/asteroid.cpp +++ b/src/mame/audio/asteroid.cpp @@ -316,7 +316,7 @@ WRITE8_MEMBER(asteroid_state::asteroid_noise_reset_w) MACHINE_CONFIG_START(asteroid_state::asteroid_sound) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, asteroid_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.4) @@ -332,7 +332,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(asteroid_state::astdelux_sound) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, astdelux_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/audio/astrof.cpp b/src/mame/audio/astrof.cpp index 88fbb45e2ee..497591479e0 100644 --- a/src/mame/audio/astrof.cpp +++ b/src/mame/audio/astrof.cpp @@ -140,7 +140,7 @@ static const char *const astrof_sample_names[] = }; MACHINE_CONFIG_START(astrof_state::astrof_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(4) MCFG_SAMPLES_NAMES(astrof_sample_names) @@ -196,7 +196,7 @@ WRITE8_MEMBER(astrof_state::tomahawk_audio_w) MACHINE_CONFIG_START(astrof_state::tomahawk_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("snsnd", SN76477) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C MCFG_SN76477_DECAY_RES(0) // decay_res N/C diff --git a/src/mame/audio/avalnche.cpp b/src/mame/audio/avalnche.cpp index 2803c2da03a..e462d19cfb2 100644 --- a/src/mame/audio/avalnche.cpp +++ b/src/mame/audio/avalnche.cpp @@ -104,7 +104,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(avalnche_state::avalnche_sound) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, avalnche_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/audio/bwidow.cpp b/src/mame/audio/bwidow.cpp index 1d0c55bab27..a4dea00bb78 100644 --- a/src/mame/audio/bwidow.cpp +++ b/src/mame/audio/bwidow.cpp @@ -150,7 +150,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(bwidow_state::bwidow_audio) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("pokey1", POKEY, MASTER_CLOCK / 8) /* C/D3 */ MCFG_POKEY_ALLPOT_R_CB(IOPORT("DSW0")) diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index b5a912b3b0c..aada4df6c6f 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -399,7 +399,7 @@ WRITE8_MEMBER(bzone_state::bzone_sounds_w) MACHINE_CONFIG_START(bzone_state::bzone_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("pokey", POKEY, BZONE_MASTER_CLOCK / 8) MCFG_POKEY_ALLPOT_R_CB(IOPORT("IN3")) diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp index aec6a37d83d..0c35c32a044 100644 --- a/src/mame/audio/cage.cpp +++ b/src/mame/audio/cage.cpp @@ -637,7 +637,8 @@ MACHINE_CONFIG_START(atari_cage_device::device_add_mconfig) MCFG_TIMER_DEVICE_ADD("cage_timer1", DEVICE_SELF, atari_cage_device, cage_timer_callback) /* sound hardware */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_GENERIC_LATCH_16_ADD("soundlatch") diff --git a/src/mame/audio/cheekyms.cpp b/src/mame/audio/cheekyms.cpp index 238732f4e19..85359b96afb 100644 --- a/src/mame/audio/cheekyms.cpp +++ b/src/mame/audio/cheekyms.cpp @@ -38,7 +38,7 @@ WRITE_LINE_MEMBER(cheekyms_audio_device::coin_extra_w) { m_coin_extra->write_li MACHINE_CONFIG_START(cheekyms_audio_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sound_nl", NETLIST_SOUND, 48000) MCFG_NETLIST_SETUP(cheekyms) diff --git a/src/mame/audio/cinemat.cpp b/src/mame/audio/cinemat.cpp index 48a23311981..68d999b434c 100644 --- a/src/mame/audio/cinemat.cpp +++ b/src/mame/audio/cinemat.cpp @@ -159,7 +159,7 @@ MACHINE_CONFIG_START(cinemat_state::spacewar_sound) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, spacewar_sound3_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, spacewar_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(8) @@ -211,7 +211,7 @@ MACHINE_CONFIG_START(cinemat_state::barrier_sound) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, barrier_sound1_w)) MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, cinemat_state, barrier_sound2_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(3) @@ -268,7 +268,7 @@ MACHINE_CONFIG_START(cinemat_state::speedfrk_sound) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, speedfrk_sound3_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, speedfrk_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(1) @@ -353,7 +353,7 @@ MACHINE_CONFIG_START(cinemat_state::starhawk_sound) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound4_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, starhawk_sound7_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(5) @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(cinemat_state::sundance_sound) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound4_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, sundance_sound7_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(6) @@ -510,7 +510,7 @@ MACHINE_CONFIG_START(cinemat_state::tailg_sound) MCFG_DEVICE_MODIFY("outlatch") MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, tailg_sound_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(6) @@ -584,7 +584,7 @@ MACHINE_CONFIG_START(cinemat_state::warrior_sound) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, warrior_sound3_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, warrior_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(5) @@ -684,7 +684,7 @@ MACHINE_CONFIG_START(cinemat_state::armora_sound) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, armora_sound3_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, armora_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(7) @@ -781,7 +781,7 @@ MACHINE_CONFIG_START(cinemat_state::ripoff_sound) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, ripoff_sound4_w)) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, cinemat_state, ripoff_sound7_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(6) @@ -898,7 +898,7 @@ MACHINE_CONFIG_START(cinemat_state::starcas_sound) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, starcas_sound3_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, starcas_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(8) @@ -1030,7 +1030,7 @@ MACHINE_CONFIG_START(cinemat_state::solarq_sound) MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cinemat_state, solarq_sound1_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, solarq_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(8) @@ -1170,7 +1170,7 @@ MACHINE_CONFIG_START(cinemat_state::boxingb_sound) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, boxingb_sound3_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, boxingb_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(12) @@ -1287,7 +1287,7 @@ MACHINE_CONFIG_START(cinemat_state::wotw_sound) MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cinemat_state, wotw_sound3_w)) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, wotw_sound4_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(8) @@ -1414,7 +1414,7 @@ MACHINE_CONFIG_START(cinemat_state::demon_sound) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE(*this, cinemat_state, demon_sound4_w)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay1", AY8910, 3579545) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, cinemat_state, sound_porta_r)) diff --git a/src/mame/audio/copsnrob.cpp b/src/mame/audio/copsnrob.cpp index 0b4e04eb07a..264bf1c57fc 100644 --- a/src/mame/audio/copsnrob.cpp +++ b/src/mame/audio/copsnrob.cpp @@ -697,7 +697,8 @@ WRITE_LINE_MEMBER(copsnrob_state::one_start_w) MACHINE_CONFIG_START(copsnrob_state::copsnrob_audio) /* sound hardware */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("discrete", DISCRETE, copsnrob_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) diff --git a/src/mame/audio/crbaloon.cpp b/src/mame/audio/crbaloon.cpp index 4e1e15d6590..48f4236aabe 100644 --- a/src/mame/audio/crbaloon.cpp +++ b/src/mame/audio/crbaloon.cpp @@ -140,7 +140,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(crbaloon_state::crbaloon_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("snsnd", SN76477) MCFG_SN76477_NOISE_PARAMS(RES_K(47), RES_K(330), CAP_P(470)) // noise + filter diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp index a89370ea1d0..34207213b53 100644 --- a/src/mame/audio/dcs.cpp +++ b/src/mame/audio/dcs.cpp @@ -2480,7 +2480,7 @@ MACHINE_CONFIG_START(dcs_audio_device::add_mconfig_dcs ) MCFG_TIMER_DEVICE_ADD("dcs_reg_timer", DEVICE_SELF, dcs_audio_device, dcs_irq) MCFG_TIMER_DEVICE_ADD("dcs_int_timer", DEVICE_SELF, dcs_audio_device, internal_timer_callback) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("dac", DMADAC) // AD-1851 16bit mono MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -2585,7 +2585,8 @@ MACHINE_CONFIG_START(dcs2_audio_device::add_mconfig_dcs2 ) MCFG_TIMER_DEVICE_ADD("dcs_int_timer", DEVICE_SELF, dcs_audio_device, internal_timer_callback) MCFG_TIMER_DEVICE_ADD("dcs_hle_timer", DEVICE_SELF, dcs_audio_device, transfer_watchdog_callback) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("dac1", DMADAC) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) @@ -2665,7 +2666,8 @@ MACHINE_CONFIG_START(dcs2_audio_dsio_device::device_add_mconfig) MCFG_TIMER_DEVICE_ADD("dcs_int_timer", DEVICE_SELF, dcs_audio_device, internal_timer_callback) MCFG_TIMER_DEVICE_ADD("dcs_sport0_timer", DEVICE_SELF, dcs_audio_device, sport0_irq) // roadburn needs this to pass harware test - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("dac1", DMADAC) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) @@ -2706,7 +2708,8 @@ MACHINE_CONFIG_START(dcs2_audio_denver_device::device_add_mconfig) MCFG_TIMER_DEVICE_ADD("dcs_int_timer", DEVICE_SELF, dcs_audio_device, internal_timer_callback) MCFG_TIMER_DEVICE_ADD("dcs_sport0_timer", DEVICE_SELF, dcs_audio_device, sport0_irq) // Atlantis driver waits for sport0 rx interrupts - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("dac1", DMADAC) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp index 8230204a507..e3da4e65b27 100644 --- a/src/mame/audio/decobsmt.cpp +++ b/src/mame/audio/decobsmt.cpp @@ -53,7 +53,8 @@ MACHINE_CONFIG_START(decobsmt_device::device_add_mconfig) MCFG_DEVICE_PROGRAM_MAP(decobsmt_map) MCFG_DEVICE_PERIODIC_INT_DRIVER(decobsmt_device, decobsmt_firq_interrupt, 489) /* Fixed FIRQ of 489Hz as measured on real (pinball) machine */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_BSMT2000_ADD(BSMT_TAG, XTAL(24'000'000)) MCFG_DEVICE_ADDRESS_MAP(0, bsmt_map) MCFG_BSMT2000_READY_CALLBACK(decobsmt_device, bsmt_ready_callback) diff --git a/src/mame/audio/dkong.cpp b/src/mame/audio/dkong.cpp index 490248e6ef6..6c468c05db7 100644 --- a/src/mame/audio/dkong.cpp +++ b/src/mame/audio/dkong.cpp @@ -1352,7 +1352,7 @@ MACHINE_CONFIG_START(dkong_state::dkong2b_audio) MCFG_MCS48_PORT_T0_IN_CB(READLINE("ls259.6h", latch8_device, bit5_q_r)) MCFG_MCS48_PORT_T1_IN_CB(READLINE("ls259.6h", latch8_device, bit4_q_r)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, dkong2b_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1425,7 +1425,7 @@ MACHINE_CONFIG_START(dkong_state::dkongjr_audio) MCFG_MCS48_PORT_T0_IN_CB(READLINE("ls259.6h", latch8_device, bit5_q_r)) MCFG_MCS48_PORT_T1_IN_CB(READLINE("ls259.6h", latch8_device, bit4_q_r)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, dkongjr_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -1444,5 +1444,5 @@ MACHINE_CONFIG_START(dkong_state::dkong3_audio) MCFG_LATCH8_ADD( "latch2") MCFG_LATCH8_ADD( "latch3") - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MACHINE_CONFIG_END diff --git a/src/mame/audio/efo_zsu.cpp b/src/mame/audio/efo_zsu.cpp index cbf54a42b5a..21a652f296f 100644 --- a/src/mame/audio/efo_zsu.cpp +++ b/src/mame/audio/efo_zsu.cpp @@ -221,7 +221,7 @@ MACHINE_CONFIG_START(efo_zsu_device::device_add_mconfig) MCFG_INPUT_MERGER_ANY_HIGH("soundirq") // 74HC03 NAND gate MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("soundcpu", INPUT_LINE_IRQ0)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("aysnd0", AY8910, 4000000/2) MCFG_AY8910_PORT_A_WRITE_CB(MEMBANK("rombank")) MCFG_DEVCB_MASK(0x03) diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index 3a5a4c5a052..6a8244930ac 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -765,7 +765,7 @@ MACHINE_CONFIG_START(exidy_state::venture_audio) MCFG_PIA_CB2_HANDLER(WRITELINE("pia0", pia6821_device, ca1_w)) MCFG_PIA_IRQB_HANDLER(WRITELINE("custom", exidy_sound_device, update_irq_state)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("custom", EXIDY_VENTURE, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) @@ -1014,7 +1014,7 @@ MACHINE_CONFIG_START(victory_state::victory_audio) MCFG_PIA_CB2_HANDLER(WRITELINE("custom", victory_sound_device, main_ack_w)) MCFG_PIA_IRQB_HANDLER(WRITELINE("custom", exidy_sound_device, update_irq_state)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("custom", EXIDY_VICTORY, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/audio/harddriv.cpp b/src/mame/audio/harddriv.cpp index fee321d9c4a..6957ca97472 100644 --- a/src/mame/audio/harddriv.cpp +++ b/src/mame/audio/harddriv.cpp @@ -453,7 +453,7 @@ MACHINE_CONFIG_START(harddriv_sound_board_device::device_add_mconfig) MCFG_TMS32010_BIO_IN_CB(READLINE(*this, harddriv_sound_board_device, hdsnddsp_get_bio)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", AM6012, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.5) // ls374d.75e + ls374d.90e + am6012 MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index 034a24d2fe6..db3c6cb5609 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -400,7 +400,8 @@ MACHINE_CONFIG_START(hng64_state::hng64_audio) MCFG_V53_TCU_OUT1_HANDLER(WRITELINE(*this, hng64_state, tcu_tm1_cb)) MCFG_V53_TCU_OUT2_HANDLER(WRITELINE(*this, hng64_state, tcu_tm2_cb)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("l7a1045", L7A1045, 32000000/2 ) // ?? MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp index 5187c93c814..a8f5dc42df4 100644 --- a/src/mame/audio/irem.cpp +++ b/src/mame/audio/irem.cpp @@ -412,7 +412,7 @@ MACHINE_CONFIG_START(m62_audio_device::device_add_mconfig) MCFG_DEVICE_IO_MAP(irem_sound_portmap) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */ MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT) @@ -482,7 +482,7 @@ MACHINE_CONFIG_START(m52_soundc_audio_device::device_add_mconfig) MCFG_DEVICE_PROGRAM_MAP(m52_small_sound_map) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */ MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT) @@ -515,7 +515,7 @@ MACHINE_CONFIG_START(m52_large_audio_device::device_add_mconfig) /* 10 yard fig MCFG_DEVICE_IO_MAP(irem_sound_portmap) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay_45m", AY8910, XTAL(3'579'545)/4) /* verified on pcb */ MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT) diff --git a/src/mame/audio/jedi.cpp b/src/mame/audio/jedi.cpp index ea606f556e6..7a14d89232f 100644 --- a/src/mame/audio/jedi.cpp +++ b/src/mame/audio/jedi.cpp @@ -196,7 +196,8 @@ MACHINE_CONFIG_START(jedi_state::jedi_audio) MCFG_DEVICE_ADD("audiocpu", M6502, JEDI_AUDIO_CPU_CLOCK) MCFG_DEVICE_PROGRAM_MAP(audio_map) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK) MCFG_POKEY_OUTPUT_OPAMP(RES_K(1), 0.0, 5.0) diff --git a/src/mame/audio/leland.cpp b/src/mame/audio/leland.cpp index c9300beb150..765e01f70e7 100644 --- a/src/mame/audio/leland.cpp +++ b/src/mame/audio/leland.cpp @@ -134,7 +134,7 @@ WRITE_LINE_MEMBER(leland_80186_sound_device::i80186_tmr1_w) } MACHINE_CONFIG_START(leland_80186_sound_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u31 + ad7524.u46 MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u32 + ad7524.u47 MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // 74hc374.u33 + ad7524.u48 @@ -175,7 +175,7 @@ MACHINE_CONFIG_START(leland_80186_sound_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(redline_80186_sound_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -225,7 +225,7 @@ MACHINE_CONFIG_START(redline_80186_sound_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(ataxx_80186_sound_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC @@ -252,7 +252,7 @@ MACHINE_CONFIG_START(ataxx_80186_sound_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(wsf_80186_sound_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac1", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_DEVICE_ADD("dac2", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC MCFG_DEVICE_ADD("dac3", AD7524, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.2) // unknown DAC diff --git a/src/mame/audio/llander.cpp b/src/mame/audio/llander.cpp index b29eb4dba67..6c2ec3510b1 100644 --- a/src/mame/audio/llander.cpp +++ b/src/mame/audio/llander.cpp @@ -99,7 +99,7 @@ WRITE8_MEMBER(asteroid_state::llander_sounds_w) MACHINE_CONFIG_START(asteroid_state::llander_sound) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, llander_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/audio/mario.cpp b/src/mame/audio/mario.cpp index 07d13d2c313..840a4cdfdcc 100644 --- a/src/mame/audio/mario.cpp +++ b/src/mame/audio/mario.cpp @@ -652,7 +652,7 @@ MACHINE_CONFIG_START(mario_state::mario_audio) MCFG_MCS48_PORT_T0_IN_CB(READLINE(*this, mario_state, mario_sh_t0_r)) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, mario_state, mario_sh_t1_r)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") @@ -684,7 +684,7 @@ MACHINE_CONFIG_START(mario_state::masao_audio) MCFG_DEVICE_ADD("audiocpu", Z80, 24576000/16) /* ???? */ MCFG_DEVICE_PROGRAM_MAP(masao_sound_map) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index a2b64a7da4b..f4d9781f174 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -147,7 +147,7 @@ static const char *const seawolf_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::seawolf_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(5) MCFG_SAMPLES_NAMES(seawolf_sample_names) @@ -201,7 +201,8 @@ static const char *const gunfight_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::gunfight_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("samples1", SAMPLES) MCFG_SAMPLES_CHANNELS(1) @@ -308,7 +309,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::tornbase_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, tornbase_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) MACHINE_CONFIG_END @@ -351,7 +352,7 @@ WRITE8_MEMBER(mw8080bw_state::tornbase_audio_w) *************************************/ MACHINE_CONFIG_START(mw8080bw_state::zzzap_audio ) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MACHINE_CONFIG_END @@ -553,7 +554,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::maze_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, maze_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -799,7 +800,8 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::boothill_audio) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("discrete", DISCRETE, boothill_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -1028,7 +1030,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::checkmat_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, checkmat_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.4) MACHINE_CONFIG_END @@ -1238,7 +1240,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::desertgu_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, desertgu_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MACHINE_CONFIG_END @@ -1502,7 +1504,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::dplay_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, dplay_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.8) MACHINE_CONFIG_END @@ -1544,7 +1546,8 @@ static const char *const gmissile_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::gmissile_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("samples1", SAMPLES) MCFG_SAMPLES_CHANNELS(1) @@ -1637,7 +1640,8 @@ static const char *const m4_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::m4_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("samples1", SAMPLES) MCFG_SAMPLES_CHANNELS(2) @@ -1892,7 +1896,7 @@ static const char *const clowns_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::clowns_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(1) @@ -2262,7 +2266,7 @@ DISCRETE_GAIN(NODE_RELATIVE(SPACWALK_SPRINGBOARD_HIT1_SND, _num - 1), DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::spacwalk_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, spacwalk_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -2490,7 +2494,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::shuffle_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, shuffle_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -2669,7 +2673,8 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::dogpatch_audio) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("discrete", DISCRETE, dogpatch_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) @@ -3173,7 +3178,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::spcenctr_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("snsnd", SN76477) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C @@ -3260,7 +3265,7 @@ static const char *const phantom2_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::phantom2_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(2) MCFG_SAMPLES_NAMES(phantom2_sample_names) @@ -3388,7 +3393,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::bowler_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, bowler_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1) @@ -3504,7 +3509,7 @@ static const char *const invaders_sample_names[] = MACHINE_CONFIG_START(mw8080bw_state::invaders_samples_audio) MCFG_SOUND_START_OVERRIDE(mw8080bw_state, samples) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("snsnd", SN76477) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C @@ -4084,7 +4089,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::invaders_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("snsnd", SN76477) MCFG_SN76477_NOISE_PARAMS(0, 0, 0) // noise + filter: N/C @@ -4501,7 +4506,7 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::blueshrk_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, blueshrk_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END @@ -4662,7 +4667,8 @@ DISCRETE_SOUND_END MACHINE_CONFIG_START(mw8080bw_state::invad2ct_audio) - MCFG_SPEAKER_STANDARD_STEREO("spk1", "spk2") + SPEAKER(config, "spk1").front_left(); + SPEAKER(config, "spk2").front_right(); MCFG_DEVICE_ADD("discrete", DISCRETE, invad2ct_discrete) MCFG_SOUND_ROUTE(0, "spk1", 0.5) diff --git a/src/mame/audio/n8080.cpp b/src/mame/audio/n8080.cpp index 2d731eec23f..d311fe1e21d 100644 --- a/src/mame/audio/n8080.cpp +++ b/src/mame/audio/n8080.cpp @@ -489,7 +489,7 @@ MACHINE_CONFIG_START(n8080_state::spacefev_sound) MCFG_TIMER_DRIVER_ADD_PERIODIC("vco_timer", n8080_state, spacefev_vco_voltage_timer, attotime::from_hz(1000)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("n8080_dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) @@ -527,7 +527,7 @@ MACHINE_CONFIG_START(n8080_state::sheriff_sound) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, n8080_state, n8080_dac_w)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("n8080_dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) @@ -569,7 +569,7 @@ MACHINE_CONFIG_START(n8080_state::helifire_sound) MCFG_TIMER_DRIVER_ADD_PERIODIC("helifire_dac_volume_timer", n8080_state, helifire_dac_volume_timer, attotime::from_hz(1000)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("helifire_dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "helifire_dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "helifire_dac", -1.0, DAC_VREF_NEG_INPUT) diff --git a/src/mame/audio/nichisnd.cpp b/src/mame/audio/nichisnd.cpp index 8609756730c..d5b4d0ceb1c 100644 --- a/src/mame/audio/nichisnd.cpp +++ b/src/mame/audio/nichisnd.cpp @@ -91,7 +91,7 @@ MACHINE_CONFIG_START(nichisnd_device::device_add_mconfig) MCFG_TMPZ84C011_ZC0_CB(WRITELINE("audiocpu", tmpz84c011_device, trg3)) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index 4d9c8543501..d6f1bded52f 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -196,7 +196,8 @@ MACHINE_CONFIG_START(qix_state::qix_audio) MCFG_PIA_CA2_HANDLER(WRITE8(*this, qix_state, sndpia_2_warning_w)) MCFG_PIA_CB2_HANDLER(WRITE8(*this, qix_state, sndpia_2_warning_w)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("discrete", DISCRETE, qix_discrete) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) @@ -212,7 +213,7 @@ MACHINE_CONFIG_START(qix_state::slither_audio) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, qix_state, qix_pia_dint)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, qix_state, qix_pia_dint)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/audio/rax.cpp b/src/mame/audio/rax.cpp index df634c31983..71f6a04e222 100644 --- a/src/mame/audio/rax.cpp +++ b/src/mame/audio/rax.cpp @@ -504,7 +504,8 @@ MACHINE_CONFIG_START(acclaim_rax_device::device_add_mconfig) MCFG_GENERIC_LATCH_16_ADD("data_in") MCFG_GENERIC_LATCH_16_ADD("data_out") - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("dacl", DMADAC) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) diff --git a/src/mame/audio/redalert.cpp b/src/mame/audio/redalert.cpp index 67070bcdb1a..db7e75138cd 100644 --- a/src/mame/audio/redalert.cpp +++ b/src/mame/audio/redalert.cpp @@ -222,7 +222,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::redalert_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); redalert_audio_m37b(config); redalert_audio_voice(config); @@ -239,7 +239,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(redalert_state::ww3_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); redalert_audio_m37b(config); @@ -357,7 +357,7 @@ MACHINE_CONFIG_START(redalert_state::demoneye_audio) MCFG_SOUND_START_OVERRIDE( redalert_state, demoneye ) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/audio/scramble.cpp b/src/mame/audio/scramble.cpp index 818b23cf6e6..3e4b9a2ad75 100644 --- a/src/mame/audio/scramble.cpp +++ b/src/mame/audio/scramble.cpp @@ -312,7 +312,7 @@ MACHINE_CONFIG_START(scramble_state::ad2083_audio) MCFG_TMSPROM_PDC_CB(WRITELINE("tms", tms5110_device, pdc_w)) /* tms pdc func */ MCFG_TMSPROM_CTL_CB(WRITE8("tms", tms5110_device, ctl_w)) /* tms ctl func */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_GENERIC_LATCH_8_ADD("soundlatch") diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp index ea6cf52efc8..749f65e2f06 100644 --- a/src/mame/audio/segam1audio.cpp +++ b/src/mame/audio/segam1audio.cpp @@ -63,7 +63,8 @@ MACHINE_CONFIG_START(segam1audio_device::device_add_mconfig) MCFG_DEVICE_ADD(M68000_TAG, M68000, 10000000) // verified on real h/w MCFG_DEVICE_PROGRAM_MAP(segam1audio_map) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD(YM3438_TAG, YM3438, 8000000) MCFG_SOUND_ROUTE(0, "lspeaker", 0.60) diff --git a/src/mame/audio/spacefb.cpp b/src/mame/audio/spacefb.cpp index 1787413ab71..3128fd58a13 100644 --- a/src/mame/audio/spacefb.cpp +++ b/src/mame/audio/spacefb.cpp @@ -78,7 +78,7 @@ static const char *const spacefb_sample_names[] = MACHINE_CONFIG_START(spacefb_state::spacefb_audio) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index 03b736c8455..223da7f106c 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -207,7 +207,7 @@ WRITE8_MEMBER(spiders_state::spiders_audio_ctrl_w) MACHINE_CONFIG_START(spiders_state::spiders_audio) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("discrete", DISCRETE, spiders_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/audio/sprint8.cpp b/src/mame/audio/sprint8.cpp index 5339365152a..91d0a89203c 100644 --- a/src/mame/audio/sprint8.cpp +++ b/src/mame/audio/sprint8.cpp @@ -300,10 +300,10 @@ MACHINE_CONFIG_START(sprint8_state::sprint8_audio) /* sound hardware */ /* the proper way is to hook up 4 speakers, but they are not really * F/R/L/R speakers. Though you can pretend the 1-2 mix is the front. */ - MCFG_SPEAKER_ADD("speaker_1_2", 0.0, 0.0, 1.0) /* front */ - MCFG_SPEAKER_ADD("speaker_3_7", -0.2, 0.0, 1.0) /* left */ - 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 */ + SPEAKER(config, "speaker_1_2", 0.0, 0.0, 1.0); // front + SPEAKER(config, "speaker_3_7", -0.2, 0.0, 1.0); // left + SPEAKER(config, "speaker_5_6", 0.0, 0.0, -0.5); // back + SPEAKER(config, "speaker_4_8", 0.2, 0.0, 1.0); // right MCFG_DEVICE_ADD("discrete", DISCRETE, sprint8_discrete) MCFG_SOUND_ROUTE(0, "speaker_1_2", 1.0) diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index 3450b1fa153..fc038c8a68e 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -216,7 +216,8 @@ MACHINE_CONFIG_START(taito_en_device::device_add_mconfig) MCFG_DEVICE_ADD("dpram", MB8421, 0) // host accesses this from the other side /* sound hardware */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("pump", ESQ_5505_5510_PUMP, XTAL(30'476'100) / (2 * 16 * 32)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) diff --git a/src/mame/audio/targ.cpp b/src/mame/audio/targ.cpp index d54ab88ce27..fbdfc484172 100644 --- a/src/mame/audio/targ.cpp +++ b/src/mame/audio/targ.cpp @@ -177,7 +177,7 @@ SAMPLES_START_CB_MEMBER(exidy_state::targ_audio_start) MACHINE_CONFIG_START(exidy_state::spectar_audio) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(4) @@ -193,7 +193,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(exidy_state::targ_audio) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(4) diff --git a/src/mame/audio/timeplt.cpp b/src/mame/audio/timeplt.cpp index 2d992fdbd28..04b206d6246 100644 --- a/src/mame/audio/timeplt.cpp +++ b/src/mame/audio/timeplt.cpp @@ -195,7 +195,7 @@ MACHINE_CONFIG_START(timeplt_audio_device::device_add_mconfig) MCFG_DEVICE_PROGRAM_MAP(timeplt_sound_map) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_GENERIC_LATCH_8_ADD(m_soundlatch) diff --git a/src/mame/audio/turbo.cpp b/src/mame/audio/turbo.cpp index f430001a7ad..08fd950006d 100644 --- a/src/mame/audio/turbo.cpp +++ b/src/mame/audio/turbo.cpp @@ -186,10 +186,10 @@ static const char *const turbo_sample_names[] = MACHINE_CONFIG_START(turbo_state::turbo_samples) /* this is the cockpit speaker configuration */ - MCFG_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */ - MCFG_SPEAKER_ADD("bspeaker", 0.0, 0.0, -0.5) /* back */ - MCFG_SPEAKER_ADD("lspeaker", -0.2, 0.0, 1.0) /* left */ - MCFG_SPEAKER_ADD("rspeaker", 0.2, 0.0, 1.0) /* right */ + SPEAKER(config, "fspeaker", 0.0, 0.0, 1.0); // front + SPEAKER(config, "bspeaker", 0.0, 0.0, -0.5); // back + SPEAKER(config, "lspeaker", -0.2, 0.0, 1.0); // left + SPEAKER(config, "rspeaker", 0.2, 0.0, 1.0); // right MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(10) @@ -430,7 +430,8 @@ static const char *const subroc3d_sample_names[] = }; MACHINE_CONFIG_START(turbo_state::subroc3d_samples) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(12) @@ -575,7 +576,7 @@ static const char *const buckrog_sample_names[]= MACHINE_CONFIG_START(turbo_state::buckrog_samples) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES) MCFG_SAMPLES_CHANNELS(6) MCFG_SAMPLES_NAMES(buckrog_sample_names) diff --git a/src/mame/audio/vicdual-97271p.cpp b/src/mame/audio/vicdual-97271p.cpp index 3a9a77dbc9e..6daeb676d89 100644 --- a/src/mame/audio/vicdual-97271p.cpp +++ b/src/mame/audio/vicdual-97271p.cpp @@ -87,7 +87,7 @@ s97271p_device::s97271p_device(const machine_config &mconfig, const char *tag, d //------------------------------------------------- MACHINE_CONFIG_START(s97271p_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); /* samples */ MCFG_DEVICE_ADD("samples", SAMPLES) |