diff options
Diffstat (limited to 'src/devices/bus')
85 files changed, 137 insertions, 113 deletions
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp index 214c63de6a6..6817176c202 100644 --- a/src/devices/bus/a2bus/a2alfam2.cpp +++ b/src/devices/bus/a2bus/a2alfam2.cpp @@ -40,7 +40,8 @@ DEFINE_DEVICE_TYPE(A2BUS_AESMS, a2bus_aesms_device, "a2aesms", "Applied Engin //------------------------------------------------- MACHINE_CONFIG_START(a2bus_sn76489_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r") + SPEAKER(config, "alf_l").front_left(); + SPEAKER(config, "alf_r").front_right(); MCFG_DEVICE_ADD(SN1_TAG, SN76489, 1020484) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50) @@ -52,7 +53,8 @@ MACHINE_CONFIG_START(a2bus_sn76489_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(a2bus_aesms_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("alf_l", "alf_r") + SPEAKER(config, "alf_l").front_left(); + SPEAKER(config, "alf_r").front_right(); MCFG_DEVICE_ADD(SN1_TAG, SN76489, 1020484) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "alf_l", 0.50) diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp index 935ad309993..6c69ae6a024 100644 --- a/src/devices/bus/a2bus/a2arcadebd.cpp +++ b/src/devices/bus/a2bus/a2arcadebd.cpp @@ -43,7 +43,7 @@ MACHINE_CONFIG_START(a2bus_arcboard_device::device_add_mconfig) MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG ) MCFG_SCREEN_UPDATE_DEVICE( TMS_TAG, tms9918a_device, screen_update ) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(AY_TAG, AY8910, 1022727) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp index 669a63503a3..5efd112a779 100644 --- a/src/devices/bus/a2bus/a2dx1.cpp +++ b/src/devices/bus/a2bus/a2dx1.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(A2BUS_DX1, a2bus_dx1_device, "a2dx1", "Decillonix DX-1") //------------------------------------------------- MACHINE_CONFIG_START(a2bus_dx1_device::device_add_mconfig) - 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.5) // unknown DAC MCFG_DEVICE_ADD("dacvol", DAC_8BIT_R2R, 0) // unknown DAC 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/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp index 8516431d4e2..15e0cb16697 100644 --- a/src/devices/bus/a2bus/a2echoii.cpp +++ b/src/devices/bus/a2bus/a2echoii.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(A2BUS_ECHOII, a2bus_echoii_device, "a2echoii", "Street Electr //------------------------------------------------- MACHINE_CONFIG_START(a2bus_echoii_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("echoii") + SPEAKER(config, "echoii").front_center(); MCFG_DEVICE_ADD(TMS_TAG, TMS5220, 640000) // Note the Echo II card has a "FREQ" potentiometer which can be used to adjust the tms5220's clock frequency; 640khz is the '8khz' value according to the tms5220 datasheet MCFG_SOUND_ROUTE(ALL_OUTPUTS, "echoii", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index 2b82cbc536f..6d11cbebf27 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -50,7 +50,8 @@ DEFINE_DEVICE_TYPE(A2BUS_MCMS2, a2bus_mcms2_device, "a2mcms2", "Mountain Compute //------------------------------------------------- MACHINE_CONFIG_START(a2bus_mcms1_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("mcms_l", "mcms_r") + SPEAKER(config, "mcms_l").front_left(); + SPEAKER(config, "mcms_r").front_right(); MCFG_DEVICE_ADD(ENGINE_TAG, MCMS, 1000000) MCFG_MCMS_IRQ_CALLBACK(WRITELINE(*this, a2bus_mcms1_device, irq_w)) diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index a6348f40314..83ffd9d43b5 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -49,7 +49,8 @@ MACHINE_CONFIG_START(a2bus_ayboard_device::device_add_mconfig) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_b)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via2_irq_w)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD(AY1_TAG, AY8913, 1022727) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_DEVICE_ADD(AY2_TAG, AY8913, 1022727) @@ -67,8 +68,10 @@ MACHINE_CONFIG_START(a2bus_phasor_device::device_add_mconfig) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_b)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via2_irq_w)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SPEAKER_STANDARD_STEREO("lspeaker2", "rspeaker2") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); + SPEAKER(config, "lspeaker2").front_left(); + SPEAKER(config, "rspeaker2").front_right(); MCFG_DEVICE_ADD(AY1_TAG, AY8913, 1022727) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_DEVICE_ADD(AY2_TAG, AY8913, 1022727) @@ -90,13 +93,14 @@ MACHINE_CONFIG_START(a2bus_echoplus_device::device_add_mconfig) MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(*this, a2bus_ayboard_device, via2_out_b)) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, a2bus_ayboard_device, via2_irq_w)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD(AY1_TAG, AY8913, 1022727) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_DEVICE_ADD(AY2_TAG, AY8913, 1022727) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - MCFG_SPEAKER_STANDARD_MONO("echosp") + SPEAKER(config, "echosp").front_center(); MCFG_DEVICE_ADD(E2P_TMS_TAG, TMS5220, 640000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "echosp", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp index a497363788d..21ea8d1fdca 100644 --- a/src/devices/bus/a2bus/a2sam.cpp +++ b/src/devices/bus/a2bus/a2sam.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SAM, a2bus_sam_device, "a2sam", "Don't Ask Software S.A //------------------------------------------------- MACHINE_CONFIG_START(a2bus_sam_device::device_add_mconfig) - 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.5) // 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/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index 77ec1b3ea5c..0f9900a95bf 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -168,7 +168,7 @@ MACHINE_CONFIG_START(a2bus_pcxporter_device::device_add_mconfig) MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_xt_keyboards, STR_KBD_KEYTRONIC_PC3270) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/a2bus/ssbapple.cpp b/src/devices/bus/a2bus/ssbapple.cpp index 508f4b46685..bde53973c13 100644 --- a/src/devices/bus/a2bus/ssbapple.cpp +++ b/src/devices/bus/a2bus/ssbapple.cpp @@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(A2BUS_SSBAPPLE, a2bus_ssb_device, "a2ssbapl", "Multitech Indu //------------------------------------------------- MACHINE_CONFIG_START(a2bus_ssb_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("ssbapple") + SPEAKER(config, "ssbapple").front_center(); MCFG_DEVICE_ADD(TMS_TAG, TMS5220, 640000) // guess - this gives 8 kHz output according to the datasheet MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssbapple", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp index 2307bd5ac5e..a9c44aed117 100644 --- a/src/devices/bus/a2bus/ssprite.cpp +++ b/src/devices/bus/a2bus/ssprite.cpp @@ -40,7 +40,7 @@ MACHINE_CONFIG_START(a2bus_ssprite_device::device_add_mconfig) MCFG_TMS9928A_SCREEN_ADD_NTSC( SCREEN_TAG ) MCFG_SCREEN_UPDATE_DEVICE( TMS_TAG, tms9918a_device, screen_update ) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(AY_TAG, AY8912, 1022727) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_DEVICE_ADD(TMS5220_TAG, TMS5220, 640000) diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 6593f89f269..8c39f5bf001 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -121,7 +121,7 @@ WRITE8_MEMBER(a78_megacart_device::write_40xx) // VersaBoard + POKEY @ 0x0450 MACHINE_CONFIG_START(a78_rom_p450_vb_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index 4bf9d084287..b40eea850c4 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -245,7 +245,7 @@ WRITE8_MEMBER(a78_rom_pokey_device::write_40xx) // TO DO: do we need a PAL variant?!? MACHINE_CONFIG_START(a78_rom_pokey_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) @@ -343,7 +343,7 @@ WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx) } MACHINE_CONFIG_START(a78_rom_sg_pokey_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) @@ -498,14 +498,14 @@ WRITE8_MEMBER(a78_rom_act_device::write_40xx) // Machine configs for PCB variants with a POKEY at $0450 MACHINE_CONFIG_START(a78_rom_p450_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("pokey_450") + SPEAKER(config, "pokey_450").front_center(); MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00) MACHINE_CONFIG_END MACHINE_CONFIG_START(a78_rom_p450_pokey_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "addon", 1.00) @@ -516,14 +516,14 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a78_rom_p450_sg_ram_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("pokey_450") + SPEAKER(config, "pokey_450").front_center(); MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00) MACHINE_CONFIG_END MACHINE_CONFIG_START(a78_rom_p450_sg9_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("pokey_450") + SPEAKER(config, "pokey_450").front_center(); MCFG_DEVICE_ADD("pokey450", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "pokey_450", 1.00) diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index 826dda467d3..7859b655b93 100644 --- a/src/devices/bus/a7800/xboard.cpp +++ b/src/devices/bus/a7800/xboard.cpp @@ -109,7 +109,7 @@ void a78_xm_device::device_reset() MACHINE_CONFIG_START(a78_xboard_device::device_add_mconfig) MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr) - MCFG_SPEAKER_STANDARD_MONO("xb_speaker") + SPEAKER(config, "xb_speaker").front_center(); MCFG_DEVICE_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00) @@ -118,7 +118,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(a78_xm_device::device_add_mconfig) MCFG_A78_CARTRIDGE_ADD("xb_slot", a7800_cart, nullptr) - MCFG_SPEAKER_STANDARD_MONO("xb_speaker") + SPEAKER(config, "xb_speaker").front_center(); MCFG_DEVICE_ADD("xb_pokey", POKEY, XTAL(14'318'181)/8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "xb_speaker", 1.00) diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp index 97cce80367f..1aaaa97b09b 100644 --- a/src/devices/bus/abckb/abc77.cpp +++ b/src/devices/bus/abckb/abc77.cpp @@ -144,7 +144,7 @@ MACHINE_CONFIG_START(abc77_device::device_add_mconfig) MCFG_WATCHDOG_TIME_INIT(attotime::from_hz(XTAL(4'608'000)/3/5/4096)) // discrete sound - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE, abc77_discrete) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp index 9e27927bb93..af0132cc724 100644 --- a/src/devices/bus/abckb/abc99.cpp +++ b/src/devices/bus/abckb/abc99.cpp @@ -172,7 +172,7 @@ MACHINE_CONFIG_START(abc99_device::device_add_mconfig) MCFG_DEVICE_DISABLE() // HACK fix for broken serial I/O // sound hardware - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.cpp b/src/devices/bus/bbc/1mhzbus/beebsid.cpp index 7de066e5933..c2e9509b658 100644 --- a/src/devices/bus/bbc/1mhzbus/beebsid.cpp +++ b/src/devices/bus/bbc/1mhzbus/beebsid.cpp @@ -31,7 +31,7 @@ DEFINE_DEVICE_TYPE(BBC_BEEBSID, bbc_beebsid_device, "beebsid", "BeebSID") //------------------------------------------------- MACHINE_CONFIG_START(bbc_beebsid_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD(MOS8580_TAG, MOS8580, XTAL(16'000'000) / 16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) diff --git a/src/devices/bus/bbc/userport/beebspch.cpp b/src/devices/bus/bbc/userport/beebspch.cpp index 0ddc6d7f09a..d7f40d5783d 100644 --- a/src/devices/bus/bbc/userport/beebspch.cpp +++ b/src/devices/bus/bbc/userport/beebspch.cpp @@ -51,7 +51,7 @@ const tiny_rom_entry *bbc_beebspch_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(bbc_beebspch_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(SP0256_TAG, SP0256, 14_MHz_XTAL / 4) // TODO: Crystal unknown MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, bbc_beebspch_device, cb1_w)) MCFG_SP0256_STANDBY_CB(WRITELINE(*this, bbc_beebspch_device, cb2_w)) diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp index 25c870085b0..6973f8bd2de 100644 --- a/src/devices/bus/c64/currah_speech.cpp +++ b/src/devices/bus/c64/currah_speech.cpp @@ -113,7 +113,7 @@ const tiny_rom_entry *c64_currah_speech_cartridge_device::device_rom_region() co //------------------------------------------------- MACHINE_CONFIG_START(c64_currah_speech_cartridge_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(SP0256_TAG, SP0256, 4000000) // ??? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp index 02e44d73af7..8ec79474d50 100644 --- a/src/devices/bus/c64/magic_voice.cpp +++ b/src/devices/bus/c64/magic_voice.cpp @@ -232,7 +232,7 @@ MACHINE_CONFIG_START(c64_magic_voice_cartridge_device::device_add_mconfig) MCFG_DEVICE_ADD(CD40105_TAG, CD40105, 0) MCFG_40105_DATA_IN_READY_CB(WRITELINE(MOS6525_TAG, tpi6525_device, i3_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(T6721A_TAG, T6721A, XTAL(640'000)) MCFG_T6721A_EOS_HANDLER(WRITELINE(MOS6525_TAG, tpi6525_device, i2_w)) MCFG_T6721A_PHI2_HANDLER(WRITELINE(DEVICE_SELF, c64_magic_voice_cartridge_device, phi2_w)) diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp index fd5b36306d7..daaac1e10c4 100644 --- a/src/devices/bus/c64/sfx_sound_expander.cpp +++ b/src/devices/bus/c64/sfx_sound_expander.cpp @@ -42,7 +42,7 @@ WRITE_LINE_MEMBER( c64_sfx_sound_expander_cartridge_device::opl_irq_w ) //------------------------------------------------- MACHINE_CONFIG_START(c64_sfx_sound_expander_cartridge_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(YM3526_TAG, YM3526, XTAL(3'579'545)) MCFG_YM3526_IRQ_HANDLER(WRITELINE(*this, c64_sfx_sound_expander_cartridge_device, opl_irq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp index ff566a8456b..09427458fe7 100644 --- a/src/devices/bus/c64/speakeasy.cpp +++ b/src/devices/bus/c64/speakeasy.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(C64_SPEAKEASY, c64_speakeasy_cartridge_device, "c64_speakeasy //------------------------------------------------- MACHINE_CONFIG_START(c64_speakeasy_cartridge_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(SC01A_TAG, VOTRAX_SC01, 720000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85) diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp index 13e7503b2fc..ca55b15da34 100644 --- a/src/devices/bus/cbus/pc9801_118.cpp +++ b/src/devices/bus/cbus/pc9801_118.cpp @@ -51,7 +51,7 @@ WRITE_LINE_MEMBER(pc9801_118_device::pc9801_sound_irq) //------------------------------------------------- MACHINE_CONFIG_START(pc9801_118_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("opn3", YM2608, MAIN_CLOCK_X2*4) // actually YMF288, unknown clock / divider, might be X1 x 5 actually MCFG_YM2608_IRQ_HANDLER(WRITELINE(*this, pc9801_118_device, pc9801_sound_irq)) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_118_device, opn_porta_r)) diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp index 45dbe8bd216..ab5cba671f6 100644 --- a/src/devices/bus/cbus/pc9801_26.cpp +++ b/src/devices/bus/cbus/pc9801_26.cpp @@ -52,7 +52,7 @@ WRITE_LINE_MEMBER(pc9801_26_device::pc9801_sound_irq) //------------------------------------------------- MACHINE_CONFIG_START(pc9801_26_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("opn", YM2203, MAIN_CLOCK_X1*2) // unknown clock / divider MCFG_YM2203_IRQ_HANDLER(WRITELINE(*this, pc9801_26_device, pc9801_sound_irq)) MCFG_AY8910_PORT_A_READ_CB(READ8(*this, pc9801_26_device, opn_porta_r)) diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp index ca7d5f4c8a8..ea57d86f41e 100644 --- a/src/devices/bus/cbus/pc9801_86.cpp +++ b/src/devices/bus/cbus/pc9801_86.cpp @@ -53,7 +53,8 @@ WRITE_LINE_MEMBER(pc9801_86_device::sound_irq) //------------------------------------------------- MACHINE_CONFIG_START(pc9801_86_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("opna", YM2608, 7.987_MHz_XTAL) MCFG_YM2608_IRQ_HANDLER(WRITELINE(*this, pc9801_86_device, sound_irq)) MCFG_AY8910_OUTPUT_TYPE(0) diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp index 6f9d3bbbd49..0e5d39579da 100644 --- a/src/devices/bus/cbus/pc9801_amd98.cpp +++ b/src/devices/bus/cbus/pc9801_amd98.cpp @@ -46,7 +46,8 @@ DEFINE_DEVICE_TYPE(PC9801_AMD98, pc9801_amd98_device, "pc9801_amd98", "pc9801_am //------------------------------------------------- MACHINE_CONFIG_START(pc9801_amd98_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ay1", AY8910, MAIN_CLOCK_X1*2) MCFG_AY8910_PORT_A_READ_CB(IOPORT("OPN_PA1")) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, pc9801_amd98_device,ay3_address_w)) diff --git a/src/devices/bus/centronics/covox.cpp b/src/devices/bus/centronics/covox.cpp index 9db269fc137..e508578ffe6 100644 --- a/src/devices/bus/centronics/covox.cpp +++ b/src/devices/bus/centronics/covox.cpp @@ -40,7 +40,7 @@ centronics_covox_device::centronics_covox_device(const machine_config &mconfig, MACHINE_CONFIG_START(centronics_covox_device::device_add_mconfig) /* sound hardware */ - 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.5) // 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) @@ -89,7 +89,8 @@ centronics_covox_stereo_device::centronics_covox_stereo_device(const machine_con MACHINE_CONFIG_START(centronics_covox_stereo_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // unknown DAC MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/devices/bus/centronics/digiblst.cpp b/src/devices/bus/centronics/digiblst.cpp index a97f86a3c8a..99a046f4d13 100644 --- a/src/devices/bus/centronics/digiblst.cpp +++ b/src/devices/bus/centronics/digiblst.cpp @@ -40,7 +40,7 @@ centronics_digiblaster_device::centronics_digiblaster_device(const machine_confi MACHINE_CONFIG_START(centronics_digiblaster_device::device_add_mconfig) /* sound hardware */ - 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.5) // 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/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index aa25e459cc8..b6b2b9348f6 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -229,7 +229,7 @@ MACHINE_CONFIG_START(epson_ex800_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_ex800) /* audio hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("beeper", BEEP, 4000) /* measured at 4000 Hz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index 9e782023bb5..d86737dabfe 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -85,7 +85,7 @@ MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig) MCFG_DEFAULT_LAYOUT(layout_lx800) /* audio hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("beeper", BEEP, 4000) // ? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.05) diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index a3c327267b8..4da390513c5 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -141,7 +141,7 @@ MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DRIVER(epson_lx810l_device, screen_update_lx810l) /* audio hardware */ - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp index 25aafe1f0a3..310e037fe17 100644 --- a/src/devices/bus/coco/coco_gmc.cpp +++ b/src/devices/bus/coco/coco_gmc.cpp @@ -52,7 +52,7 @@ namespace MACHINE_CONFIG_START(coco_pak_gmc_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("gmc_speaker") + SPEAKER(config, "gmc_speaker").front_center(); MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, 4_MHz_XTAL) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/coco/coco_orch90.cpp b/src/devices/bus/coco/coco_orch90.cpp index 58738456824..f1dcdf3ff28 100644 --- a/src/devices/bus/coco/coco_orch90.cpp +++ b/src/devices/bus/coco/coco_orch90.cpp @@ -108,7 +108,8 @@ namespace //************************************************************************** MACHINE_CONFIG_START(coco_orch90_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ldac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5) // ls374.ic5 + r7 (8x20k) + r9 (8x10k) MCFG_DEVICE_ADD("rdac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5) // ls374.ic4 + r6 (8x20k) + r8 (8x10k) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp index 8c630dfb75c..b79e82c78cd 100644 --- a/src/devices/bus/coco/coco_ssc.cpp +++ b/src/devices/bus/coco/coco_ssc.cpp @@ -167,7 +167,7 @@ MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig) MCFG_RAM_DEFAULT_SIZE("2K") MCFG_RAM_DEFAULT_VALUE(0x00) - MCFG_SPEAKER_STANDARD_MONO("ssc_audio") + SPEAKER(config, "ssc_audio").front_center(); MCFG_DEVICE_ADD(SP0256_TAG, SP0256, XTAL(3'120'000)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssc_audio", SP0256_GAIN) diff --git a/src/devices/bus/coco/dragon_jcbsnd.cpp b/src/devices/bus/coco/dragon_jcbsnd.cpp index 239e4160405..68265861715 100644 --- a/src/devices/bus/coco/dragon_jcbsnd.cpp +++ b/src/devices/bus/coco/dragon_jcbsnd.cpp @@ -81,7 +81,7 @@ uint8_t* dragon_jcbsnd_device::get_cart_base() //------------------------------------------------- MACHINE_CONFIG_START(dragon_jcbsnd_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay8910", AY8910, DERIVED_CLOCK(1, 1)) /* AY-3-8910 - clock not verified */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/cpc/amdrum.cpp b/src/devices/bus/cpc/amdrum.cpp index 3d892f473d9..dc2253a79a1 100644 --- a/src/devices/bus/cpc/amdrum.cpp +++ b/src/devices/bus/cpc/amdrum.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(CPC_AMDRUM, cpc_amdrum_device, "cpc_amdrum", "Amdrum") MACHINE_CONFIG_START(cpc_amdrum_device::device_add_mconfig) - 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.5) // 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/devices/bus/cpc/cpc_ssa1.cpp b/src/devices/bus/cpc/cpc_ssa1.cpp index cbfbe0c161d..592d6970693 100644 --- a/src/devices/bus/cpc/cpc_ssa1.cpp +++ b/src/devices/bus/cpc/cpc_ssa1.cpp @@ -116,7 +116,7 @@ const tiny_rom_entry *cpc_dkspeech_device::device_rom_region() const // device machine config MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sp0256",SP0256,XTAL(3'120'000)) MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, cpc_ssa1_device, lrq_cb)) MCFG_SP0256_STANDBY_CB(WRITELINE(*this, cpc_ssa1_device, sby_cb)) @@ -132,7 +132,7 @@ MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(cpc_dkspeech_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sp0256",SP0256,XTAL(4'000'000)) // uses the CPC's clock from pin 50 of the expansion port MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, cpc_dkspeech_device, lrq_cb)) MCFG_SP0256_STANDBY_CB(WRITELINE(*this, cpc_dkspeech_device, sby_cb)) diff --git a/src/devices/bus/cpc/magicsound.cpp b/src/devices/bus/cpc/magicsound.cpp index cd18889445d..b817aebbb1a 100644 --- a/src/devices/bus/cpc/magicsound.cpp +++ b/src/devices/bus/cpc/magicsound.cpp @@ -56,7 +56,7 @@ MACHINE_CONFIG_START(al_magicsound_device::device_add_mconfig) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(*this, al_magicsound_device, da0_w)) MCFG_PIT8253_CLK2(XTAL(4'000'000)) - 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.5) // 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/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp index a375fccce2c..433955b9ba7 100644 --- a/src/devices/bus/cpc/playcity.cpp +++ b/src/devices/bus/cpc/playcity.cpp @@ -30,7 +30,8 @@ MACHINE_CONFIG_START(cpc_playcity_device::device_add_mconfig) MCFG_Z80CTC_ZC2_CB(WRITELINE("ctc",z80ctc_device, trg3)) MCFG_Z80CTC_INTR_CB(WRITELINE(*this, cpc_playcity_device, ctc_intr_cb)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ymz_1",YMZ294,XTAL(4'000'000)) // when timer is not set, operates at 4MHz (interally divided by 2, so equivalent to the ST) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MCFG_DEVICE_ADD("ymz_2",YMZ294,XTAL(4'000'000)) diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index 0be0ed9a8e5..54ef433fae4 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -423,7 +423,7 @@ MACHINE_CONFIG_START(ecb_grip21_device::device_add_mconfig) MCFG_PALETTE_ADD_MONOCHROME("palette") // sound hardware - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SPEAKER_LEVELS(4, speaker_levels) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp index 90b2000568f..1925a55620f 100644 --- a/src/devices/bus/einstein/pipe/speculator.cpp +++ b/src/devices/bus/einstein/pipe/speculator.cpp @@ -44,7 +44,7 @@ MACHINE_CONFIG_START(einstein_speculator_device::device_add_mconfig) MCFG_TTL74123_CLEAR_PIN_VALUE(0) MCFG_TTL74123_OUTPUT_CHANGED_CB(WRITELINE(*this, einstein_speculator_device, ic5b_q_w)) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette") MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0) diff --git a/src/devices/bus/einstein/userport/speech.cpp b/src/devices/bus/einstein/userport/speech.cpp index 3d049ae1355..47306193d69 100644 --- a/src/devices/bus/einstein/userport/speech.cpp +++ b/src/devices/bus/einstein/userport/speech.cpp @@ -38,7 +38,7 @@ const tiny_rom_entry *einstein_speech_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(einstein_speech_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sp0256", SP0256, 3120000) // ??? MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/electron/cart/sndexp.cpp b/src/devices/bus/electron/cart/sndexp.cpp index c04305cbb57..de0c7704020 100644 --- a/src/devices/bus/electron/cart/sndexp.cpp +++ b/src/devices/bus/electron/cart/sndexp.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_SNDEXP, electron_sndexp_device, "electron_sndexp", " //------------------------------------------------- MACHINE_CONFIG_START(electron_sndexp_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sn76489", SN76489, 16_MHz_XTAL / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/electron/cart/sndexp3.cpp b/src/devices/bus/electron/cart/sndexp3.cpp index 26f62fcd7d2..1bf32aa2fb4 100644 --- a/src/devices/bus/electron/cart/sndexp3.cpp +++ b/src/devices/bus/electron/cart/sndexp3.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_SNDEXP3, electron_sndexp3_device, "electron_sndexp3" MACHINE_CONFIG_START(electron_sndexp3_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sn76489", SN76489, 16_MHz_XTAL / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp index f18ea158766..2eaa3fae241 100644 --- a/src/devices/bus/electron/m2105.cpp +++ b/src/devices/bus/electron/m2105.cpp @@ -56,7 +56,7 @@ ROM_END MACHINE_CONFIG_START(electron_m2105_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_INPUT_MERGER_ANY_HIGH("irqs") MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(*this, electron_m2105_device, intrq_w)) diff --git a/src/devices/bus/interpro/keyboard/hle.cpp b/src/devices/bus/interpro/keyboard/hle.cpp index 936ac09e3f3..3f2d70d2293 100644 --- a/src/devices/bus/interpro/keyboard/hle.cpp +++ b/src/devices/bus/interpro/keyboard/hle.cpp @@ -278,7 +278,7 @@ WRITE_LINE_MEMBER(hle_device_base::input_txd) } MACHINE_CONFIG_START(hle_device_base::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("bell") + SPEAKER(config, "bell").front_center(); MCFG_DEVICE_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/interpro/keyboard/lle.cpp b/src/devices/bus/interpro/keyboard/lle.cpp index 7454162c8ce..1ebfb25c083 100644 --- a/src/devices/bus/interpro/keyboard/lle.cpp +++ b/src/devices/bus/interpro/keyboard/lle.cpp @@ -153,7 +153,7 @@ WRITE_LINE_MEMBER(lle_device_base::input_txd) MACHINE_CONFIG_START(lle_device_base::device_add_mconfig) MCFG_DEVICE_ADD("mcu", I8049, 11_MHz_XTAL) - MCFG_SPEAKER_STANDARD_MONO("keyboard") + SPEAKER(config, "keyboard").front_center(); MCFG_DEVICE_ADD("bell", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "keyboard", 0.25) MACHINE_CONFIG_END diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp index 3a05c6598b0..27d100d5864 100644 --- a/src/devices/bus/intv/ecs.cpp +++ b/src/devices/bus/intv/ecs.cpp @@ -95,7 +95,7 @@ void intv_ecs_device::late_subslot_setup() MACHINE_CONFIG_START(intv_ecs_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono_ecs") + SPEAKER(config, "mono_ecs").front_center(); MCFG_DEVICE_ADD("ay8914", AY8914, XTAL(3'579'545)/2) MCFG_AY8910_PORT_A_READ_CB(READ8("ctrl_port", intvecs_control_port_device, portA_r)) diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp index bc49aca12be..4ce9417b467 100644 --- a/src/devices/bus/intv/voice.cpp +++ b/src/devices/bus/intv/voice.cpp @@ -70,7 +70,7 @@ void intv_voice_device::late_subslot_setup() //------------------------------------------------- MACHINE_CONFIG_START(intv_voice_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono_voice") + SPEAKER(config, "mono_voice").front_center(); MCFG_DEVICE_ADD("sp0256_speech", SP0256, 3120000) /* The Intellivoice uses a speaker with its own volume control so the relative volumes to use are subjective */ diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp index de4e62b2dd8..814fdeaaf58 100644 --- a/src/devices/bus/isa/adlib.cpp +++ b/src/devices/bus/isa/adlib.cpp @@ -45,7 +45,7 @@ DEFINE_DEVICE_TYPE(ISA8_ADLIB, isa8_adlib_device, "isa_adlib", "Ad Lib Sound Car //------------------------------------------------- MACHINE_CONFIG_START(isa8_adlib_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ym3812", YM3812, ym3812_StdClock) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 3.00) MACHINE_CONFIG_END diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 1b327a25534..8dfb1acdae2 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -168,7 +168,7 @@ MACHINE_CONFIG_START(dectalk_isa_device::device_add_mconfig) MCFG_TMS32010_BIO_IN_CB(READLINE(*this, dectalk_isa_device, bio_line_r)) MCFG_DEVICE_PROGRAM_MAP(dectalk_dsp_map) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_12BIT_R2R, 0) MCFG_SOUND_ROUTE(0, "speaker", 1.0) // 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/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp index be30269c8e5..e812827e4e6 100644 --- a/src/devices/bus/isa/gblaster.cpp +++ b/src/devices/bus/isa/gblaster.cpp @@ -69,7 +69,8 @@ DEFINE_DEVICE_TYPE(ISA8_GAME_BLASTER, isa8_gblaster_device, "isa_gblaster", "Gam //------------------------------------------------- MACHINE_CONFIG_START(isa8_gblaster_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_SAA1099_ADD("saa1099.1", 7159090) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index 8617da6556b..cdae451590d 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -1251,7 +1251,8 @@ INPUT_PORTS_END //------------------------------------------------- MACHINE_CONFIG_START(isa16_gus_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("gf1",GGF1,GF1_CLOCK) MCFG_SOUND_ROUTE(0,"lspeaker",0.50) MCFG_SOUND_ROUTE(1,"rspeaker",0.50) diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index 5ff0aab0b68..6fd01e344d8 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -403,7 +403,8 @@ MACHINE_CONFIG_START(isa8_ibm_mfc_device::device_add_mconfig) MCFG_PIT8253_CLK2(XTAL(4'000'000) / 2) MCFG_PIT8253_OUT2_HANDLER(WRITELINE("d8253", pit8253_device, write_clk1)) - MCFG_SPEAKER_STANDARD_STEREO("ymleft", "ymright") + SPEAKER(config, "ymleft").front_left(); + SPEAKER(config, "ymright").front_right(); MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(4'000'000)) MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, isa8_ibm_mfc_device, ibm_mfc_ym_irq)) MCFG_SOUND_ROUTE(0, "ymleft", 1.00) diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp index 648dd451814..f2c4cdd2b75 100644 --- a/src/devices/bus/isa/ide.cpp +++ b/src/devices/bus/isa/ide.cpp @@ -74,7 +74,8 @@ MACHINE_CONFIG_START(isa16_ide_device::device_add_mconfig) MCFG_IDE_CONTROLLER_ADD("ide", ata_devices, "hdd", nullptr, false) MCFG_ATA_INTERFACE_IRQ_HANDLER(WRITELINE(*this, isa16_ide_device, ide_interrupt)) - MCFG_SPEAKER_STANDARD_STEREO("lheadphone", "rheadphone") + SPEAKER(config, "lheadphone").front_left(); + SPEAKER(config, "rheadphone").front_right(); MCFG_DEVICE_MODIFY("ide:0") MCFG_SLOT_OPTION_MACHINE_CONFIG("cdrom", cdrom_headphones) diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index 5ef08234926..ee443231087 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -64,7 +64,7 @@ MACHINE_CONFIG_START(p1_sound_device::device_add_mconfig) MCFG_PIT8253_CLK2(XTAL(12'500'000)/10) // MCFG_PIT8253_OUT2_HANDLER(XXX) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("filter", FILTER_RC) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "filter", 0.5) // unknown DAC diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index b0e0ceb75b6..97aa2b1527d 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -417,7 +417,8 @@ MACHINE_CONFIG_START(sb16_lle_device::device_add_mconfig) MCFG_MCS51_PORT_P2_IN_CB(READ8(*this, sb16_lle_device, p2_r)) MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, sb16_lle_device, p2_w)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ymf262", YMF262, XTAL(14'318'181)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 394f072e791..55e6f1a6a40 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -1141,7 +1141,8 @@ DEFINE_DEVICE_TYPE(ISA16_SOUND_BLASTER_16, isa16_sblaster16_device, "isa_sblaste //------------------------------------------------- MACHINE_CONFIG_START(isa8_sblaster1_0_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ym3812", YM3812, ym3812_StdClock) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 3.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 3.00) @@ -1166,7 +1167,8 @@ MACHINE_CONFIG_START(isa8_sblaster1_0_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(isa8_sblaster1_5_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ym3812", YM3812, ym3812_StdClock) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) @@ -1186,7 +1188,8 @@ MACHINE_CONFIG_START(isa8_sblaster1_5_device::device_add_mconfig) MACHINE_CONFIG_END MACHINE_CONFIG_START(isa16_sblaster16_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ymf262", YMF262, ymf262_StdClock) MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp index 453c8d5125d..612457ff1fb 100644 --- a/src/devices/bus/isa/ssi2001.cpp +++ b/src/devices/bus/isa/ssi2001.cpp @@ -11,7 +11,7 @@ DEFINE_DEVICE_TYPE(ISA8_SSI2001, ssi2001_device, "ssi2001", "Innovation SSI-2001 Audio Adapter") MACHINE_CONFIG_START(ssi2001_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sid6581", MOS6581, XTAL(14'318'181)/16) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_PC_JOY_ADD("pc_joy") diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index 66062702719..96986c8bc0c 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -123,7 +123,8 @@ MACHINE_CONFIG_START(stereo_fx_device::device_add_mconfig) MCFG_MCS51_PORT_P3_IN_CB(READ8(*this, stereo_fx_device, p3_r)) MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, stereo_fx_device, p3_w)) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ym3812", YM3812, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) diff --git a/src/devices/bus/lpci/southbridge.cpp b/src/devices/bus/lpci/southbridge.cpp index 8b824466d9b..f7ba7f59c8e 100644 --- a/src/devices/bus/lpci/southbridge.cpp +++ b/src/devices/bus/lpci/southbridge.cpp @@ -85,7 +85,7 @@ MACHINE_CONFIG_START(southbridge_device::device_add_mconfig) MCFG_BUS_MASTER_IDE_CONTROLLER_SPACE(":maincpu", AS_PROGRAM) // sound hardware - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/devices/bus/msx_cart/fmpac.cpp b/src/devices/bus/msx_cart/fmpac.cpp index 7cc7e463d65..7054c8c366a 100644 --- a/src/devices/bus/msx_cart/fmpac.cpp +++ b/src/devices/bus/msx_cart/fmpac.cpp @@ -31,7 +31,7 @@ msx_cart_fmpac_device::msx_cart_fmpac_device(const machine_config &mconfig, cons MACHINE_CONFIG_START(msx_cart_fmpac_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(10'738'635)/3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_CONFIG_END diff --git a/src/devices/bus/msx_cart/konami.cpp b/src/devices/bus/msx_cart/konami.cpp index 272ee085188..e9eb4325e78 100644 --- a/src/devices/bus/msx_cart/konami.cpp +++ b/src/devices/bus/msx_cart/konami.cpp @@ -143,7 +143,7 @@ msx_cart_konami_scc_device::msx_cart_konami_scc_device(const machine_config &mco MACHINE_CONFIG_START(msx_cart_konami_scc_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("k051649", K051649, XTAL(10'738'635)/3/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_CONFIG_END @@ -474,7 +474,7 @@ msx_cart_synthesizer_device::msx_cart_synthesizer_device(const machine_config &m MACHINE_CONFIG_START(msx_cart_synthesizer_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - 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.1) // 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) @@ -547,7 +547,7 @@ msx_cart_konami_sound_device::msx_cart_konami_sound_device(const machine_config MACHINE_CONFIG_START(msx_cart_konami_sound_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("k052539", K051649, XTAL(10'738'635)/3/2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_CONFIG_END @@ -874,7 +874,7 @@ void msx_cart_keyboard_master_device::vlm_map(address_map &map) MACHINE_CONFIG_START(msx_cart_keyboard_master_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("vlm5030", VLM5030, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_DEVICE_ADDRESS_MAP(0, vlm_map) diff --git a/src/devices/bus/msx_cart/majutsushi.cpp b/src/devices/bus/msx_cart/majutsushi.cpp index 5288360ee87..ef76b62af2a 100644 --- a/src/devices/bus/msx_cart/majutsushi.cpp +++ b/src/devices/bus/msx_cart/majutsushi.cpp @@ -28,7 +28,7 @@ msx_cart_majutsushi_device::msx_cart_majutsushi_device(const machine_config &mco MACHINE_CONFIG_START(msx_cart_majutsushi_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - 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.05) // 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/devices/bus/msx_cart/moonsound.cpp b/src/devices/bus/msx_cart/moonsound.cpp index d21810eb287..8289a086a18 100644 --- a/src/devices/bus/msx_cart/moonsound.cpp +++ b/src/devices/bus/msx_cart/moonsound.cpp @@ -38,7 +38,8 @@ void msx_cart_moonsound_device::ymf278b_map(address_map &map) MACHINE_CONFIG_START(msx_cart_moonsound_device::device_add_mconfig) // The moonsound cartridge has a separate stereo output. - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ymf278b", YMF278B, YMF278B_STD_CLOCK) MCFG_DEVICE_ADDRESS_MAP(0, ymf278b_map) MCFG_YMF278B_IRQ_HANDLER(WRITELINE(*this, msx_cart_moonsound_device, irq_w)) diff --git a/src/devices/bus/msx_cart/msx_audio.cpp b/src/devices/bus/msx_cart/msx_audio.cpp index 8235d91aac2..46983943967 100644 --- a/src/devices/bus/msx_cart/msx_audio.cpp +++ b/src/devices/bus/msx_cart/msx_audio.cpp @@ -82,7 +82,7 @@ msx_cart_msx_audio_hxmu900_device::msx_cart_msx_audio_hxmu900_device(const machi MACHINE_CONFIG_START(msx_cart_msx_audio_hxmu900_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("y8950", Y8950, XTAL(3'579'545)) // Not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_Y8950_KEYBOARD_WRITE_HANDLER(WRITE8("kbdc", msx_audio_kbdc_port_device, write)) @@ -148,7 +148,7 @@ msx_cart_msx_audio_nms1205_device::msx_cart_msx_audio_nms1205_device(const machi MACHINE_CONFIG_START(msx_cart_msx_audio_nms1205_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. // At the same time the sound is also output on two output on the nms1205 cartridge itself - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("y8950", Y8950, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_Y8950_KEYBOARD_WRITE_HANDLER(WRITE8("kbdc", msx_audio_kbdc_port_device, write)) @@ -248,7 +248,7 @@ msx_cart_msx_audio_fsca1_device::msx_cart_msx_audio_fsca1_device(const machine_c MACHINE_CONFIG_START(msx_cart_msx_audio_fsca1_device::device_add_mconfig) // This is actually incorrect. The sound output is passed back into the MSX machine where it is mixed internally and output through the system 'speaker'. - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("y8950", Y8950, XTAL(3'579'545)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_Y8950_KEYBOARD_WRITE_HANDLER(WRITE8("kbdc", msx_audio_kbdc_port_device, write)) diff --git a/src/devices/bus/msx_cart/yamaha.cpp b/src/devices/bus/msx_cart/yamaha.cpp index 27d014aa61f..1ba78c75af9 100644 --- a/src/devices/bus/msx_cart/yamaha.cpp +++ b/src/devices/bus/msx_cart/yamaha.cpp @@ -51,7 +51,8 @@ MACHINE_CONFIG_START(msx_cart_sfg_device::device_add_mconfig) // YM3012 (DAC) // YM2148 (MKS) - MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") + SPEAKER(config, "lspeaker").front_left(); + SPEAKER(config, "rspeaker").front_right(); MCFG_DEVICE_ADD("ym2151", YM2151, XTAL(3'579'545)) // The SFG01 uses a YM2151, the SFG05 uses a YM2164, input clock comes from the main cpu frequency MCFG_YM2151_IRQ_HANDLER(WRITELINE(*this, msx_cart_sfg_device, ym2151_irq_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.80) diff --git a/src/devices/bus/nes/jaleco.cpp b/src/devices/bus/nes/jaleco.cpp index 6ce19e766aa..4ea0ea6dba5 100644 --- a/src/devices/bus/nes/jaleco.cpp +++ b/src/devices/bus/nes/jaleco.cpp @@ -775,7 +775,7 @@ static const char *const jf33_sample_names[] = MACHINE_CONFIG_START(nes_jf13_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(16) @@ -786,7 +786,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nes_jf17_adpcm_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(20) @@ -797,7 +797,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nes_jf19_adpcm_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(20) @@ -808,7 +808,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nes_jf23_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(20) @@ -819,7 +819,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nes_jf24_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(6) @@ -830,7 +830,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nes_jf29_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(20) @@ -841,7 +841,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(nes_jf33_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(20) diff --git a/src/devices/bus/nes/konami.cpp b/src/devices/bus/nes/konami.cpp index d064a8d89f0..4f1a4de66e2 100644 --- a/src/devices/bus/nes/konami.cpp +++ b/src/devices/bus/nes/konami.cpp @@ -641,7 +641,7 @@ WRITE8_MEMBER(nes_konami_vrc6_device::write_h) MACHINE_CONFIG_START(nes_konami_vrc6_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); // TODO: this is not how VRC6 clock signaling works! // The board uses the CLK pin in reality, not hardcoded NTSC values! @@ -765,7 +765,7 @@ WRITE8_MEMBER(nes_konami_vrc7_device::write_h) MACHINE_CONFIG_START(nes_konami_vrc7_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); // TODO: this is not how VRC7 clock signaling works! // The board uses the CLK pin in reality, not hardcoded NTSC values! diff --git a/src/devices/bus/nes/pt554.cpp b/src/devices/bus/nes/pt554.cpp index 4211a27d234..6a1b8ac4325 100644 --- a/src/devices/bus/nes/pt554.cpp +++ b/src/devices/bus/nes/pt554.cpp @@ -91,7 +91,7 @@ static const char *const pt554_sample_names[] = MACHINE_CONFIG_START(nes_bandai_pt554_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); MCFG_DEVICE_ADD("samples", SAMPLES, 0) MCFG_SAMPLES_CHANNELS(8) diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp index 68510d7788b..2b3b3169f5d 100644 --- a/src/devices/bus/nes/sunsoft.cpp +++ b/src/devices/bus/nes/sunsoft.cpp @@ -613,7 +613,7 @@ WRITE8_MEMBER(nes_sunsoft_5_device::write_h) MACHINE_CONFIG_START(nes_sunsoft_5_device::device_add_mconfig) // additional sound hardware - MCFG_SPEAKER_STANDARD_MONO("addon") + SPEAKER(config, "addon").front_center(); // TODO: this is not how Sunsoft 5B clock signaling works! // The board uses the CLK pin in reality, not hardcoded NTSC values! diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index 805f3626645..9d1b9f75275 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -44,7 +44,7 @@ void o2_voice_device::device_start() //------------------------------------------------- MACHINE_CONFIG_START(o2_voice_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("sp0256_speech", SP0256, 3120000) MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, o2_voice_device, lrq_callback)) diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp index f33c9ddb1c8..b89ca59f7f8 100644 --- a/src/devices/bus/pet/2joysnd.cpp +++ b/src/devices/bus/pet/2joysnd.cpp @@ -94,7 +94,7 @@ ioport_constructor pet_userport_joystick_and_sound_device::device_input_ports() //------------------------------------------------- MACHINE_CONFIG_START(pet_userport_joystick_and_sound_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp index b9be2850378..a9f5ccb480a 100644 --- a/src/devices/bus/pet/cb2snd.cpp +++ b/src/devices/bus/pet/cb2snd.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(PET_USERPORT_CB2_SOUND_DEVICE, pet_userport_cb2_sound_device, //------------------------------------------------- MACHINE_CONFIG_START(pet_userport_cb2_sound_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD("dac", DAC_1BIT, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.99) MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index 1b1e3b0ca7e..f97deec6310 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -65,7 +65,7 @@ const tiny_rom_entry *plus4_sid_cartridge_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(plus4_sid_cartridge_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("speaker") + SPEAKER(config, "speaker").front_center(); MCFG_DEVICE_ADD(MOS8580_TAG, MOS8580, XTAL(17'734'470)/20) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) diff --git a/src/devices/bus/spectrum/fuller.cpp b/src/devices/bus/spectrum/fuller.cpp index 48051b7a846..4dd24161105 100644 --- a/src/devices/bus/spectrum/fuller.cpp +++ b/src/devices/bus/spectrum/fuller.cpp @@ -46,7 +46,7 @@ ioport_constructor spectrum_fuller_device::device_input_ports() const MACHINE_CONFIG_START(spectrum_fuller_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay8912", AY8912, XTAL(3'579'545) / 2) // unverified clock MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/devices/bus/spectrum/melodik.cpp b/src/devices/bus/spectrum/melodik.cpp index 28e5ac90c9e..5b7ee40c040 100644 --- a/src/devices/bus/spectrum/melodik.cpp +++ b/src/devices/bus/spectrum/melodik.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(SPECTRUM_MELODIK, spectrum_melodik_device, "spectrum_melodik" MACHINE_CONFIG_START(spectrum_melodik_device::device_add_mconfig) /* sound hardware */ - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("ay8912", AY8912, XTAL(3'579'545) / 2) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp index 8e6e1cf1694..af380b852a6 100644 --- a/src/devices/bus/spectrum/uspeech.cpp +++ b/src/devices/bus/spectrum/uspeech.cpp @@ -54,7 +54,7 @@ const tiny_rom_entry *spectrum_uspeech_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(spectrum_uspeech_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(SP0256_TAG, SP0256, XTAL(14'000'000) / 4) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp index cc45f3b005f..b15171eb046 100644 --- a/src/devices/bus/sunkbd/hlekbd.cpp +++ b/src/devices/bus/sunkbd/hlekbd.cpp @@ -788,7 +788,7 @@ WRITE_LINE_MEMBER( hle_device_base::input_txd ) --------------------------------------------------*/ MACHINE_CONFIG_START(hle_device_base::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("bell") + SPEAKER(config, "bell").front_center(); MCFG_DEVICE_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0) MACHINE_CONFIG_END diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp index d3b5a587411..e049a2c96c0 100644 --- a/src/devices/bus/svi3x8/expander/sv603.cpp +++ b/src/devices/bus/svi3x8/expander/sv603.cpp @@ -38,7 +38,7 @@ const tiny_rom_entry *sv603_device::device_rom_region() const //------------------------------------------------- MACHINE_CONFIG_START(sv603_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("snd", SN76489A, XTAL(10'738'635) / 3) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/ti8x/tispeaker.cpp b/src/devices/bus/ti8x/tispeaker.cpp index 84cd9638e27..17d81fe10b9 100644 --- a/src/devices/bus/ti8x/tispeaker.cpp +++ b/src/devices/bus/ti8x/tispeaker.cpp @@ -27,7 +27,8 @@ stereo_speaker_device::stereo_speaker_device( MACHINE_CONFIG_START(stereo_speaker_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_STEREO("outl", "outr") + SPEAKER(config, "outl").front_left(); + SPEAKER(config, "outr").front_right(); MCFG_DEVICE_ADD("lspkr", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "outl", 0.50) @@ -70,7 +71,7 @@ mono_speaker_device::mono_speaker_device( MACHINE_CONFIG_START(mono_speaker_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("spkr", SPEAKER_SOUND, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp index f4c3f489404..fc23ad4d7b0 100644 --- a/src/devices/bus/ti99/peb/evpc.cpp +++ b/src/devices/bus/ti99/peb/evpc.cpp @@ -485,7 +485,7 @@ MACHINE_CONFIG_START(snug_enhanced_video_device::device_add_mconfig) MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL(21'477'272)) // Sound hardware - MCFG_SPEAKER_STANDARD_MONO("sound_out") + SPEAKER(config, "sound_out").front_center(); MCFG_DEVICE_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75) MCFG_SN76496_READY_HANDLER( WRITELINE(*this, snug_enhanced_video_device, ready_line) ) diff --git a/src/devices/bus/ti99/peb/spchsyn.cpp b/src/devices/bus/ti99/peb/spchsyn.cpp index f1691820fa0..edb0e5ed72d 100644 --- a/src/devices/bus/ti99/peb/spchsyn.cpp +++ b/src/devices/bus/ti99/peb/spchsyn.cpp @@ -162,7 +162,7 @@ ROM_END MACHINE_CONFIG_START(ti_speech_synthesizer_device::device_add_mconfig) MCFG_DEVICE_ADD("vsm", SPEECHROM, 0) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("speechsyn", CD2501E, 640000L) MCFG_TMS52XX_READYQ_HANDLER(WRITELINE(*this, ti_speech_synthesizer_device, speech_ready)) MCFG_TMS52XX_SPEECHROM("vsm") diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp index d6a7dab07ee..4a068b2daaf 100644 --- a/src/devices/bus/vic20/speakeasy.cpp +++ b/src/devices/bus/vic20/speakeasy.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(VIC20_SPEAKEASY, vic20_speakeasy_device, "vic20_speakeasy", " //------------------------------------------------- MACHINE_CONFIG_START(vic20_speakeasy_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD(SC01A_TAG, VOTRAX_SC01, 720000) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85) diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index a3718338057..973decb6a8a 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -51,7 +51,7 @@ DEFINE_DEVICE_TYPE(VP550, vp550_device, "vp550", "VP-550 Super Sound") //------------------------------------------------- MACHINE_CONFIG_START(vp550_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_CDP1863_ADD(CDP1863_A_TAG, 0, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp index 8d58ee26cb3..a880c33f7e0 100644 --- a/src/devices/bus/vip/vp595.cpp +++ b/src/devices/bus/vip/vp595.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(VP595, vp595_device, "vp595", "VP-595 Simple Sound") //------------------------------------------------- MACHINE_CONFIG_START(vp595_device::device_add_mconfig) - MCFG_SPEAKER_STANDARD_MONO("mono") + SPEAKER(config, "mono").front_center(); MCFG_CDP1863_ADD(CDP1863_TAG, 0, CDP1863_XTAL) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) |