diff --git a/src/emu/validity.c b/src/emu/validity.c index f5225b52fcd..d75af881284 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -166,7 +166,9 @@ INLINE int validate_tag(const game_driver *driver, const char *object, const cha /* some common names that are now deprecated */ if (strcmp(tag, "main") == 0 || strcmp(tag, "audio") == 0 || - strcmp(tag, "sound") == 0) + strcmp(tag, "sound") == 0 || + strcmp(tag, "left") == 0 || + strcmp(tag, "right") == 0) { mame_printf_error("%s: %s has invalid generic tag '%s'\n", driver->source_file, driver->name, tag); error = TRUE; diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c index 9c733511bda..61f7b0fa036 100644 --- a/src/ldplayer/ldplayer.c +++ b/src/ldplayer/ldplayer.c @@ -561,11 +561,11 @@ static MACHINE_DRIVER_START( ldplayer_core ) MDRV_MACHINE_RESET(ldplayer) /* audio hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index 48bdd65e2bc..992973f5d6b 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -776,12 +776,12 @@ MACHINE_DRIVER_START( jsa_i_stereo ) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_DRIVER_END @@ -794,8 +794,8 @@ MACHINE_DRIVER_START( jsa_i_stereo_swapped ) /* sound hardware */ MDRV_SOUND_REPLACE("ym", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "right", 0.60) - MDRV_SOUND_ROUTE(1, "left", 0.60) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.60) MACHINE_DRIVER_END @@ -807,8 +807,8 @@ MACHINE_DRIVER_START( jsa_i_stereo_pokey ) /* sound hardware */ MDRV_SOUND_ADD("pokey", POKEY, JSA_MASTER_CLOCK/2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -885,20 +885,20 @@ MACHINE_DRIVER_START( jsa_iiis_stereo ) MDRV_CPU_PERIODIC_INT(atarigen_6502_irq_gen, (double)JSA_MASTER_CLOCK/4/16/16/14) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, JSA_MASTER_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("adpcml", OKIM6295, JSA_MASTER_CLOCK/3) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) MDRV_SOUND_ADD("adpcmr", OKIM6295, JSA_MASTER_CLOCK/3) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index 20cab9accbb..03fc9993926 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -655,26 +655,26 @@ MACHINE_DRIVER_START( cage ) MDRV_CPU_PROGRAM_MAP(cage_map,0) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") #if (DAC_BUFFER_CHANNELS == 4) MDRV_SOUND_ADD("dac1", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("dac2", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ADD("dac3", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ADD("dac4", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) #else MDRV_SOUND_ADD("dac1", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("dac2", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) #endif MACHINE_DRIVER_END diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 9772245dee9..f11d9c64cc8 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -650,13 +650,13 @@ MACHINE_DRIVER_START( dcs2_audio_2115 ) MDRV_CPU_PROGRAM_MAP(dcs2_2115_program_map,0) MDRV_CPU_DATA_MAP(dcs2_2115_data_map,0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("dac2", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END @@ -682,13 +682,13 @@ MACHINE_DRIVER_START( dcs2_audio_dsio ) MDRV_CPU_DATA_MAP(dsio_data_map,0) MDRV_CPU_IO_MAP(dsio_io_map,0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("dac2", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END @@ -706,25 +706,25 @@ MACHINE_DRIVER_START( dcs2_audio_denver ) MDRV_CPU_DATA_MAP(denver_data_map,0) MDRV_CPU_IO_MAP(denver_io_map,0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("dac2", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("dac3", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("dac4", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("dac5", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("dac6", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c index 35bcb8d612a..7b5d9d754fd 100644 --- a/src/mame/audio/exidy440.c +++ b/src/mame/audio/exidy440.c @@ -944,21 +944,21 @@ MACHINE_DRIVER_START( exidy440_audio ) MDRV_CPU_PROGRAM_MAP(exidy440_audio_map,0) MDRV_CPU_VBLANK_INT("screen", irq0_line_assert) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("custom", EXIDY440, EXIDY440_MASTER_CLOCK/256) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) // MDRV_SOUND_ADD("cvsd1", MC3418, EXIDY440_MC3418_CLOCK) -// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) +// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // MDRV_SOUND_ADD("cvsd2", MC3418, EXIDY440_MC3418_CLOCK) -// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) +// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // MDRV_SOUND_ADD("cvsd3", MC3417, EXIDY440_MC3417_CLOCK) -// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) +// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // MDRV_SOUND_ADD("cvsd4", MC3417, EXIDY440_MC3417_CLOCK) -// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) +// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c index 397b6c2517b..e87e7cdc266 100644 --- a/src/mame/audio/jedi.c +++ b/src/mame/audio/jedi.c @@ -208,23 +208,23 @@ MACHINE_DRIVER_START( jedi_audio ) MDRV_SOUND_START(jedi) MDRV_SOUND_RESET(jedi) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("pokey1", POKEY, JEDI_POKEY_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("pokey2", POKEY, JEDI_POKEY_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("pokey3", POKEY, JEDI_POKEY_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) MDRV_SOUND_ADD("pokey4", POKEY, JEDI_POKEY_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("tms", TMS5220, JEDI_TMS5220_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c index 70e745958f0..5227ea11e95 100644 --- a/src/mame/audio/mcr.c +++ b/src/mame/audio/mcr.c @@ -486,14 +486,14 @@ MACHINE_DRIVER_START(mcr_ssio) MDRV_CPU_PROGRAM_MAP(ssio_map,0) MDRV_CPU_PERIODIC_INT(ssio_14024_clock, SSIO_CLOCK/2/16/10) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ssio.1", AY8910, SSIO_CLOCK/2/4) MDRV_SOUND_CONFIG(ssio_ay8910_interface_1) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33) MDRV_SOUND_ADD("ssio.2", AY8910, SSIO_CLOCK/2/4) MDRV_SOUND_CONFIG(ssio_ay8910_interface_2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) MACHINE_DRIVER_END @@ -617,8 +617,8 @@ MACHINE_DRIVER_START(chip_squeak_deluxe_stereo) MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0) MDRV_SOUND_ADD("csd", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -961,8 +961,8 @@ MACHINE_DRIVER_START(squawk_n_talk) /* only used on Discs of Tron, which is stereo */ MDRV_SOUND_ADD("snt", TMS5200, 640000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) /* the board also supports an AY-8912 and/or an 8-bit DAC, neither of */ /* which are populated on the Discs of Tron board */ diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c index 9799431a270..6ba22027780 100644 --- a/src/mame/audio/mw8080bw.c +++ b/src/mame/audio/mw8080bw.c @@ -198,15 +198,15 @@ static const samples_interface gunfight_samples_interface = MACHINE_DRIVER_START( gunfight_audio ) MDRV_SOUND_START(samples) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("samples1", SAMPLES, 0) MDRV_SOUND_CONFIG(gunfight_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ADD("samples2", SAMPLES, 0) MDRV_SOUND_CONFIG(gunfight_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END @@ -797,11 +797,11 @@ DISCRETE_SOUND_END MACHINE_DRIVER_START( boothill_audio ) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(boothill) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1616,15 +1616,15 @@ static const samples_interface gmissile_samples_interface = MACHINE_DRIVER_START( gmissile_audio ) MDRV_SOUND_START(samples) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("samples1", SAMPLES, 0) MDRV_SOUND_CONFIG(gmissile_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.9) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.9) MDRV_SOUND_ADD("samples2", SAMPLES, 0) MDRV_SOUND_CONFIG(gmissile_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.9) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.9) MACHINE_DRIVER_END @@ -1716,15 +1716,15 @@ static const samples_interface m4_samples_interface = MACHINE_DRIVER_START( m4_audio ) MDRV_SOUND_START(samples) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("samples1", SAMPLES, 0) MDRV_SOUND_CONFIG(m4_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1) MDRV_SOUND_ADD("samples2", SAMPLES, 0) MDRV_SOUND_CONFIG(m4_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1) MACHINE_DRIVER_END diff --git a/src/mame/audio/namcoc7x.h b/src/mame/audio/namcoc7x.h index 87ccee5b5fc..6cdb9ff1061 100644 --- a/src/mame/audio/namcoc7x.h +++ b/src/mame/audio/namcoc7x.h @@ -45,10 +45,10 @@ void namcoc7x_set_host_ram(UINT32 *hostram); MDRV_CPU_VBLANK_INT_HACK(namcoc7x_interrupt, 2) #define NAMCO_C7X_SOUND(clock) \ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") \ + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \ MDRV_SOUND_ADD("c352", C352, clock) \ - MDRV_SOUND_ROUTE(0, "right", 1.00) \ - MDRV_SOUND_ROUTE(1, "left", 1.00) \ - MDRV_SOUND_ROUTE(2, "right", 1.00) \ - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) \ + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) \ + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) \ + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c index 32499f10bb8..bf7cf288849 100644 --- a/src/mame/audio/qix.c +++ b/src/mame/audio/qix.c @@ -109,20 +109,20 @@ MACHINE_DRIVER_START( qix_audio ) MDRV_CPU_ADD("audiocpu", M6802, SOUND_CLOCK_OSC/2) /* 0.92 MHz */ MDRV_CPU_PROGRAM_MAP(audio_map,0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(qix) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END MACHINE_DRIVER_START( slither_audio ) MDRV_CPU_REMOVE("audiocpu") - MDRV_SPEAKER_REMOVE("left") - MDRV_SPEAKER_REMOVE("right") + MDRV_SPEAKER_REMOVE("lspeaker") + MDRV_SPEAKER_REMOVE("rspeaker") MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_REMOVE("discrete") diff --git a/src/mame/audio/taito_en.h b/src/mame/audio/taito_en.h index 32c1b610b75..c33b360e813 100644 --- a/src/mame/audio/taito_en.h +++ b/src/mame/audio/taito_en.h @@ -19,11 +19,11 @@ void taito_f3_soundsystem_reset(running_machine *machine); #define TAITO_F3_SOUND_SYSTEM_ES5505(freq) \ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") \ + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") \ MDRV_SOUND_ADD("ensoniq", ES5505, freq) \ MDRV_SOUND_CONFIG(es5505_taito_f3_config) \ - MDRV_SOUND_ROUTE(0, "left", 1.0) \ - MDRV_SOUND_ROUTE(1, "right", 1.0) \ + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) \ + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) \ ADDRESS_MAP_EXTERN(f3_sound_map, 16); diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c index d8289e22147..73ec844c8f3 100644 --- a/src/mame/audio/turbo.c +++ b/src/mame/audio/turbo.c @@ -194,48 +194,48 @@ static const samples_interface turbo_samples_interface = MACHINE_DRIVER_START( turbo_samples ) /* this is the cockpit speaker configuration */ - MDRV_SPEAKER_ADD("front", 0.0, 0.0, 1.0) - MDRV_SPEAKER_ADD("rear", 0.0, 0.0, -0.5) - MDRV_SPEAKER_ADD("left", -0.2, 0.0, 1.0) - MDRV_SPEAKER_ADD("right", 0.2, 0.0, 1.0) + MDRV_SPEAKER_ADD("fspeaker", 0.0, 0.0, 1.0) /* front */ + MDRV_SPEAKER_ADD("bspeaker", 0.0, 0.0, -0.5) /* back */ + MDRV_SPEAKER_ADD("lspeaker", -0.2, 0.0, 1.0) /* left */ + MDRV_SPEAKER_ADD("rspeaker", 0.2, 0.0, 1.0) /* right */ MDRV_SOUND_ADD("samples", SAMPLES, 0) MDRV_SOUND_CONFIG(turbo_samples_interface) /* channel 0 = CRASH.S -> CRASH.S/SM */ - MDRV_SOUND_ROUTE(0, "front", 0.25) + MDRV_SOUND_ROUTE(0, "fspeaker", 0.25) /* channel 1 = TRIG1-4 -> ALARM.M/F/R/L */ - MDRV_SOUND_ROUTE(1, "front", 0.25) - MDRV_SOUND_ROUTE(1, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 0.25) + MDRV_SOUND_ROUTE(1, "fspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.25) /* channel 2 = SLIP/SPIN -> SKID.F/R/L/M */ - MDRV_SOUND_ROUTE(2, "front", 0.25) - MDRV_SOUND_ROUTE(2, "right", 0.25) - MDRV_SOUND_ROUTE(2, "left", 0.25) + MDRV_SOUND_ROUTE(2, "fspeaker", 0.25) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.25) /* channel 3 = CRASH.L -> CRASH.L/LM */ - MDRV_SOUND_ROUTE(3, "rear", 0.25) + MDRV_SOUND_ROUTE(3, "bspeaker", 0.25) /* channel 4 = AMBU -> AMBULANCE/AMBULANCE.M */ - MDRV_SOUND_ROUTE(4, "front", 0.25) + MDRV_SOUND_ROUTE(4, "fspeaker", 0.25) /* channel 5 = ACCEL+BSEL -> MYCAR.F/W/M + MYCAR0.F/M + MYCAR1.F/M */ - MDRV_SOUND_ROUTE(5, "front", 0.25) - MDRV_SOUND_ROUTE(5, "rear", 0.25) + MDRV_SOUND_ROUTE(5, "fspeaker", 0.25) + MDRV_SOUND_ROUTE(5, "bspeaker", 0.25) /* channel 6 = OSEL -> OCAR.F/FM */ - MDRV_SOUND_ROUTE(6, "front", 0.25) + MDRV_SOUND_ROUTE(6, "fspeaker", 0.25) /* channel 7 = OSEL -> OCAR.L/LM */ - MDRV_SOUND_ROUTE(7, "left", 0.25) + MDRV_SOUND_ROUTE(7, "lspeaker", 0.25) /* channel 8 = OSEL -> OCAR.R/RM */ - MDRV_SOUND_ROUTE(8, "right", 0.25) + MDRV_SOUND_ROUTE(8, "rspeaker", 0.25) /* channel 9 = OSEL -> OCAR.W/WM */ - MDRV_SOUND_ROUTE(9, "rear", 0.25) + MDRV_SOUND_ROUTE(9, "bspeaker", 0.25) MACHINE_DRIVER_END /* @@ -450,42 +450,42 @@ static const samples_interface subroc3d_samples_interface = MACHINE_DRIVER_START( subroc3d_samples ) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("samples", SAMPLES, 0) MDRV_SOUND_CONFIG(subroc3d_samples_interface) /* MISSILE in channels 0 and 1 */ - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(1, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.25) /* TORPEDO in channels 2 and 3 */ - MDRV_SOUND_ROUTE(2, "left", 0.25) - MDRV_SOUND_ROUTE(3, "right", 0.25) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.25) /* FIGHTER in channels 4 and 5 */ - MDRV_SOUND_ROUTE(4, "left", 0.25) - MDRV_SOUND_ROUTE(5, "right", 0.25) + MDRV_SOUND_ROUTE(4, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(5, "rspeaker", 0.25) /* HIT in channels 6 and 7 */ - MDRV_SOUND_ROUTE(6, "left", 0.25) - MDRV_SOUND_ROUTE(7, "right", 0.25) + MDRV_SOUND_ROUTE(6, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(7, "rspeaker", 0.25) /* FIRE sound in channel 8 */ - MDRV_SOUND_ROUTE(8, "left", 0.25) - MDRV_SOUND_ROUTE(8, "right", 0.25) + MDRV_SOUND_ROUTE(8, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(8, "rspeaker", 0.25) /* SHIP EXP sound in channel 9 */ - MDRV_SOUND_ROUTE(9, "left", 0.25) - MDRV_SOUND_ROUTE(9, "right", 0.25) + MDRV_SOUND_ROUTE(9, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(9, "rspeaker", 0.25) /* ALARM TRIG sound in channel 10 */ - MDRV_SOUND_ROUTE(10, "left", 0.25) - MDRV_SOUND_ROUTE(10, "right", 0.25) + MDRV_SOUND_ROUTE(10, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(10, "rspeaker", 0.25) /* PROLOGUE sound in channel 11 */ - MDRV_SOUND_ROUTE(11, "left", 0.25) - MDRV_SOUND_ROUTE(11, "right", 0.25) + MDRV_SOUND_ROUTE(11, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(11, "rspeaker", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c index 00edee14db5..fe241346c56 100644 --- a/src/mame/audio/williams.c +++ b/src/mame/audio/williams.c @@ -217,24 +217,24 @@ MACHINE_DRIVER_START( williams_narc_sound ) MDRV_CPU_ADD("narc2", M6809E, NARC_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(williams_narc_slave_map,0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, NARC_FM_CLOCK) MDRV_SOUND_CONFIG(adpcm_ym2151_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("cvsd", HC55516, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index 25b4f462d9b..b4e7f57c675 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -418,14 +418,14 @@ static MACHINE_DRIVER_START( drill ) MDRV_VIDEO_START(drill) MDRV_VIDEO_UPDATE(drill) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index c899ceba681..259999b2282 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -78,7 +78,7 @@ static MACHINE_DRIVER_START( 39in1 ) MDRV_VIDEO_UPDATE(39in1) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_DRIVER_END ROM_START( 39in1 ) diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c index 2897dd22ac7..b8a70de57f5 100644 --- a/src/mame/drivers/acommand.c +++ b/src/mame/drivers/acommand.c @@ -579,17 +579,17 @@ static MACHINE_DRIVER_START( acommand ) MDRV_VIDEO_UPDATE(acommand) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index bfbd64364e0..8abfa40140b 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1334,14 +1334,14 @@ static MACHINE_DRIVER_START( pspikes ) MDRV_VIDEO_UPDATE(pspikes) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( spikes91 ) @@ -1460,14 +1460,14 @@ static MACHINE_DRIVER_START( karatblz ) MDRV_VIDEO_UPDATE(karatblz) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( spinlbrk ) @@ -1499,14 +1499,14 @@ static MACHINE_DRIVER_START( spinlbrk ) MDRV_VIDEO_UPDATE(spinlbrk) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( turbofrc ) @@ -1538,14 +1538,14 @@ static MACHINE_DRIVER_START( turbofrc ) MDRV_VIDEO_UPDATE(turbofrc) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( aerofgtb ) @@ -1578,14 +1578,14 @@ static MACHINE_DRIVER_START( aerofgtb ) MDRV_VIDEO_UPDATE(turbofrc) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( aerofgt ) @@ -1618,14 +1618,14 @@ static MACHINE_DRIVER_START( aerofgt ) MDRV_VIDEO_UPDATE(aerofgt) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( aerfboot ) diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c index ee242f090cd..1ef64c61c34 100644 --- a/src/mame/drivers/ajax.c +++ b/src/mame/drivers/ajax.c @@ -258,23 +258,23 @@ static MACHINE_DRIVER_START( ajax ) MDRV_VIDEO_UPDATE(ajax) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami1", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_interface_1) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MDRV_SOUND_ADD("konami2", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_interface_2) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index ec46780a7a5..07e634323c4 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -450,12 +450,12 @@ static MACHINE_DRIVER_START( aleck64 ) MDRV_VIDEO_START(n64) MDRV_VIDEO_UPDATE(n64) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("dac2", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static DRIVER_INIT( aleck64 ) diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index d12d08833c4..69ee5b71ce1 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -421,17 +421,17 @@ static MACHINE_DRIVER_START( alg_r1 ) MDRV_VIDEO_START(alg) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("amiga", AMIGA, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(1, "right", 0.25) - MDRV_SOUND_ROUTE(2, "right", 0.25) - MDRV_SOUND_ROUTE(3, "left", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.25) MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) /* cia */ MDRV_CIA8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf) diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index e8b93b4392e..719cef2b717 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -293,12 +293,12 @@ static MACHINE_DRIVER_START( amspdwy ) MDRV_VIDEO_UPDATE(amspdwy) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3000000) MDRV_SOUND_CONFIG(amspdwy_ym2151_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index b4dbd6e113f..818453b5b4d 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -375,17 +375,17 @@ static MACHINE_DRIVER_START( aquarium ) MDRV_VIDEO_UPDATE(aquarium) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, 1122000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END ROM_START( aquarium ) diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index 3cceff23768..5dbffde3534 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -302,13 +302,13 @@ static MACHINE_DRIVER_START( arcadia ) MDRV_VIDEO_UPDATE(amiga) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("amiga", AMIGA, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) - MDRV_SOUND_ROUTE(2, "right", 0.50) - MDRV_SOUND_ROUTE(3, "left", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.50) /* cia */ MDRV_CIA8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf) diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index e69b4beabb7..cf87e52a75b 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -266,15 +266,15 @@ static MACHINE_DRIVER_START( asterix ) MDRV_VIDEO_UPDATE(asterix) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K053260, 4000000) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index 7ccbfc4c61c..5b0e421e3fa 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -1305,13 +1305,13 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( astrocade_stereo_sound ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("astrocade1", ASTROCADE, ASTROCADE_CLOCK/4) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("astrocade2", ASTROCADE, ASTROCADE_CLOCK/4) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1331,20 +1331,20 @@ static MACHINE_DRIVER_START( seawolf2 ) MDRV_CPU_IO_MAP(port_map,0) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("samples", SAMPLES, 0) MDRV_SOUND_CONFIG(seawolf2_samples_interface) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(1, "left", 0.25) - MDRV_SOUND_ROUTE(2, "left", 0.25) - MDRV_SOUND_ROUTE(3, "left", 0.25) - MDRV_SOUND_ROUTE(4, "left", 0.25) - MDRV_SOUND_ROUTE(5, "right", 0.25) - MDRV_SOUND_ROUTE(6, "right", 0.25) - MDRV_SOUND_ROUTE(7, "right", 0.25) - MDRV_SOUND_ROUTE(8, "right", 0.25) - MDRV_SOUND_ROUTE(9, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(4, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(5, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(6, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(7, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(8, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(9, "rspeaker", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c index d98015dc978..875c340ada7 100644 --- a/src/mame/drivers/atarisy1.c +++ b/src/mame/drivers/atarisy1.c @@ -777,20 +777,20 @@ static MACHINE_DRIVER_START( atarisy1 ) MDRV_VIDEO_UPDATE(atarisy1) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MDRV_SOUND_ADD("tms", TMS5220, ATARI_CLOCK_14MHz/2/11) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) /* via */ MDRV_VIA6522_ADD("via6522_0", 0, via_interface) diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index ae96f10a022..4fe68d50136 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -1169,22 +1169,22 @@ static MACHINE_DRIVER_START( atarisy2 ) MDRV_VIDEO_UPDATE(atarisy2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("pokey1", POKEY, SOUND_CLOCK/8) MDRV_SOUND_CONFIG(pokey_interface_1) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.35) MDRV_SOUND_ADD("pokey2", POKEY, SOUND_CLOCK/8) MDRV_SOUND_CONFIG(pokey_interface_2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.35) MDRV_SOUND_ADD("tms", TMS5220, MASTER_CLOCK/4/4/2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index b7e6640d310..553029a301d 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -169,8 +169,8 @@ static void draw_sprites(running_machine *machine,bitmap_t *bitmap,const rectang static VIDEO_UPDATE(backfire) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); /* screen 1 uses pf1 as the forground and pf3 as the background */ /* screen 2 uses pf2 as the foreground and pf4 as the background */ @@ -467,7 +467,7 @@ static MACHINE_DRIVER_START( backfire ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", ARM, 28000000/4) /* Unconfirmed */ MDRV_CPU_PROGRAM_MAP(backfire_map,0) - MDRV_CPU_VBLANK_INT("left", deco32_vbl_interrupt) /* or is it "right?" */ + MDRV_CPU_VBLANK_INT("lscreen", deco32_vbl_interrupt) /* or is it "rscreen?" */ MDRV_NVRAM_HANDLER(93C46) @@ -476,14 +476,14 @@ static MACHINE_DRIVER_START( backfire ) MDRV_GFXDECODE(backfire) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MDRV_SCREEN_SIZE(40*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) @@ -494,12 +494,12 @@ static MACHINE_DRIVER_START( backfire ) MDRV_VIDEO_UPDATE(backfire) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 28000000 / 2) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index 61f3cca2c62..e258f65eaf6 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -259,20 +259,20 @@ static MACHINE_DRIVER_START( battlera ) MDRV_VIDEO_UPDATE(battlera) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2203, 12000000 / 8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MDRV_SOUND_ADD("msm", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.85) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.85) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85) MDRV_SOUND_ADD("audiocpu", C6280, 21477270/6) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MACHINE_DRIVER_END /******************************************************************************/ diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index 9cf013a2f3e..2df5b443125 100644 --- a/src/mame/drivers/bbusters.c +++ b/src/mame/drivers/bbusters.c @@ -719,14 +719,14 @@ static MACHINE_DRIVER_START( bbusters ) MDRV_VIDEO_EOF(bbuster) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(0, "right", 1.0) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( mechatt ) @@ -756,14 +756,14 @@ static MACHINE_DRIVER_START( mechatt ) MDRV_VIDEO_EOF(mechatt) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2608, 8000000) MDRV_SOUND_CONFIG(ym2608_config) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(0, "right", 0.50) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END /******************************************************************************/ diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c index e9ae25161c8..5028ae0c9e5 100644 --- a/src/mame/drivers/bestleag.c +++ b/src/mame/drivers/bestleag.c @@ -334,12 +334,12 @@ static MACHINE_DRIVER_START( bestleag ) MDRV_VIDEO_START(bestleag) MDRV_VIDEO_UPDATE(bestleag) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1000000) /* Hand-tuned */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MACHINE_DRIVER_END /* Rom Loading */ diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c index 50390d93a54..b078d044955 100644 --- a/src/mame/drivers/bigstrkb.c +++ b/src/mame/drivers/bigstrkb.c @@ -224,18 +224,18 @@ static MACHINE_DRIVER_START( bigstrkb ) MDRV_VIDEO_START(bigstrkb) MDRV_VIDEO_UPDATE(bigstrkb) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // MDRV_SOUND_ADD("ym", YM2151, ym2151_config) MDRV_SOUND_ADD("oki1", OKIM6295, 4000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("oki2", OKIM6295, 4000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MACHINE_DRIVER_END /* Rom Loading */ diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index e94d77fd75e..7be536c961a 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -151,15 +151,15 @@ static MACHINE_DRIVER_START( bingoc ) MDRV_VIDEO_START(bingoc) MDRV_VIDEO_UPDATE(bingoc) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") //might just be mono... + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") //might just be mono... MDRV_SOUND_ADD("ym", YM2151, 7159160/2) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END ROM_START( bingoc ) diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c index e5f6181d2ec..fa133fc9869 100644 --- a/src/mame/drivers/bishi.c +++ b/src/mame/drivers/bishi.c @@ -321,12 +321,12 @@ static MACHINE_DRIVER_START( bishi ) MDRV_VIDEO_UPDATE(bishi) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, SOUND_CLOCK) /* 16.9344MHz */ MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END // ROM definitions diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c index 772101f8445..8f1ea5d4b33 100644 --- a/src/mame/drivers/blackt96.c +++ b/src/mame/drivers/blackt96.c @@ -495,17 +495,17 @@ static MACHINE_DRIVER_START( blackt96 ) MDRV_VIDEO_START(blackt96) MDRV_VIDEO_UPDATE(blackt96) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, 8000000/8) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MDRV_SOUND_ADD("oki2", OKIM6295, 8000000/8) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index 3f4a824c049..7875ff6db5c 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -375,12 +375,12 @@ static MACHINE_DRIVER_START( blmbycar ) MDRV_VIDEO_UPDATE(blmbycar) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( watrball ) @@ -405,12 +405,12 @@ static MACHINE_DRIVER_START( watrball ) MDRV_VIDEO_UPDATE(blmbycar) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c index a2a86dabbc7..8f0dbe47e43 100644 --- a/src/mame/drivers/blockout.c +++ b/src/mame/drivers/blockout.c @@ -204,17 +204,17 @@ static MACHINE_DRIVER_START( blockout ) MDRV_VIDEO_UPDATE(blockout) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c index d9891af587b..7a8136a10d1 100644 --- a/src/mame/drivers/bmcbowl.c +++ b/src/mame/drivers/bmcbowl.c @@ -515,17 +515,17 @@ static MACHINE_DRIVER_START( bmcbowl ) MDRV_NVRAM_HANDLER(bmcbowl) MDRV_MACHINE_RESET(bmcbowl) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ay", AY8910, 3579545/2) MDRV_SOUND_CONFIG(ay8910_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("oki", OKIM6295, 1122000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) /* via */ MDRV_VIA6522_ADD("via6522_0", 1000000, via_interface) diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index dfbee9a791c..f75d18391df 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -487,8 +487,8 @@ static VIDEO_START(bnstars) static VIDEO_UPDATE(bnstars) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); bitmap_fill(priority_bitmap,cliprect,0); @@ -1341,14 +1341,14 @@ static MACHINE_DRIVER_START( bnstars ) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(40*8, 28*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -1359,15 +1359,15 @@ static MACHINE_DRIVER_START( bnstars ) MDRV_VIDEO_UPDATE(bnstars) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf1", YMF271, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("ymf2", YMF271, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index dfadb562970..bf79a970474 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -321,22 +321,22 @@ static MACHINE_DRIVER_START( boogwing ) MDRV_VIDEO_UPDATE(boogwing) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.40) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MACHINE_DRIVER_END /**********************************************************************************/ diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c index d9540aa67ed..03061db7f87 100644 --- a/src/mame/drivers/btoads.c +++ b/src/mame/drivers/btoads.c @@ -361,11 +361,11 @@ static MACHINE_DRIVER_START( btoads ) MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 640, 0, 512, 257, 0, 224) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("bsmt", BSMT2000, SOUND_CLOCK) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c index 456c558d007..86663e7752c 100644 --- a/src/mame/drivers/canyon.c +++ b/src/mame/drivers/canyon.c @@ -263,12 +263,12 @@ static MACHINE_DRIVER_START( canyon ) MDRV_VIDEO_UPDATE(canyon) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(canyon) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c index 07cfc59149e..a5838034ae6 100644 --- a/src/mame/drivers/cardline.c +++ b/src/mame/drivers/cardline.c @@ -216,12 +216,12 @@ static MACHINE_DRIVER_START( cardline ) MDRV_DEFAULT_LAYOUT(layout_cardline) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 7670d1c7e8e..4c086d843bf 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -1987,12 +1987,12 @@ static MACHINE_DRIVER_START( dfeveron ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2026,12 +2026,12 @@ static MACHINE_DRIVER_START( ddonpach ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2065,17 +2065,17 @@ static MACHINE_DRIVER_START( donpachi ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_1_056MHz) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.60) MDRV_SOUND_ADD("oki2", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2109,12 +2109,12 @@ static MACHINE_DRIVER_START( esprade ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2147,12 +2147,12 @@ static MACHINE_DRIVER_START( gaia ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2186,12 +2186,12 @@ static MACHINE_DRIVER_START( guwange ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -2228,23 +2228,23 @@ static MACHINE_DRIVER_START( hotdogst ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2203, XTAL_4MHz) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) - MDRV_SOUND_ROUTE(2, "left", 0.20) - MDRV_SOUND_ROUTE(2, "right", 0.20) - MDRV_SOUND_ROUTE(3, "left", 0.80) - MDRV_SOUND_ROUTE(3, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1_056MHz) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2278,12 +2278,12 @@ static MACHINE_DRIVER_START( korokoro ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2323,23 +2323,23 @@ static MACHINE_DRIVER_START( mazinger ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2203, XTAL_4MHz) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) - MDRV_SOUND_ROUTE(2, "left", 0.20) - MDRV_SOUND_ROUTE(2, "right", 0.20) - MDRV_SOUND_ROUTE(3, "left", 0.60) - MDRV_SOUND_ROUTE(3, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.60) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1_056MHz) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 2.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 2.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.0) MACHINE_DRIVER_END @@ -2379,22 +2379,22 @@ static MACHINE_DRIVER_START( metmqstr ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz / 4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.20) - MDRV_SOUND_ROUTE(1, "right", 1.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.20) MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_32MHz / 16 ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_32MHz / 16 ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2434,28 +2434,28 @@ static MACHINE_DRIVER_START( pwrinst2 ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2203, XTAL_16MHz / 4) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(0, "right", 0.40) - MDRV_SOUND_ROUTE(1, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) - MDRV_SOUND_ROUTE(2, "left", 0.40) - MDRV_SOUND_ROUTE(2, "right", 0.40) - MDRV_SOUND_ROUTE(3, "left", 0.80) - MDRV_SOUND_ROUTE(3, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.40) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.80) MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_3MHz ) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MDRV_SOUND_ADD("oki2", OKIM6295, XTAL_3MHz ) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MACHINE_DRIVER_END @@ -2495,21 +2495,21 @@ static MACHINE_DRIVER_START( sailormn ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MDRV_SOUND_ADD("oki1", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2542,12 +2542,12 @@ static MACHINE_DRIVER_START( uopoko ) MDRV_VIDEO_UPDATE(cave) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_16_9344MHz) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index 186f6da5de2..22cc131369c 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -354,12 +354,12 @@ static MACHINE_DRIVER_START( champbwl ) MDRV_VIDEO_EOF(tnzs) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) MDRV_SOUND_CONFIG(champbwl_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END ROM_START( champbwl ) diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 369a0593b91..a93cd620ef7 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -371,24 +371,24 @@ static MACHINE_DRIVER_START( chqflag ) MDRV_VIDEO_UPDATE(chqflag) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("konami1", K007232, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(k007232_interface_1) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MDRV_SOUND_ADD("konami2", K007232, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(k007232_interface_2) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MACHINE_DRIVER_END ROM_START( chqflag ) diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index f65266de439..66fb308396d 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -1789,19 +1789,19 @@ static MACHINE_DRIVER_START( bigrun ) MDRV_VIDEO_UPDATE(bigrun) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, STD_FM_CLOCK) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("oki1", OKIM6295, STD_OKI_CLOCK) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, STD_OKI_CLOCK) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1921,17 +1921,17 @@ static MACHINE_DRIVER_START( scudhamm ) MDRV_VIDEO_UPDATE(scudhamm) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c index 504a388b1fa..e4abdbce684 100644 --- a/src/mame/drivers/cliffhgr.c +++ b/src/mame/drivers/cliffhgr.c @@ -704,15 +704,15 @@ static MACHINE_DRIVER_START( cliffhgr ) MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_INDEXED16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(cliffhgr) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index ecfee23aa67..51568a051c3 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -947,26 +947,26 @@ static MACHINE_DRIVER_START( robocop2 ) MDRV_VIDEO_EOF(cninja) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, 32220000/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MDRV_SOUND_ADD("ym2", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MACHINE_DRIVER_END static MACHINE_DRIVER_START( mutantf ) @@ -995,22 +995,22 @@ static MACHINE_DRIVER_START( mutantf ) MDRV_VIDEO_UPDATE(mutantf) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MACHINE_DRIVER_END /**********************************************************************************/ diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 78a705c0c5f..916eef0b676 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -1134,13 +1134,13 @@ static MACHINE_DRIVER_START( cojagr3k ) MDRV_VIDEO_UPDATE(cojag) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index 53e27b2872c..4914a8ba16c 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -273,11 +273,11 @@ static MACHINE_DRIVER_START( contra ) MDRV_VIDEO_UPDATE(contra) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3582071) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index af3b9c25585..6a462448a0a 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -219,16 +219,16 @@ static MACHINE_DRIVER_START( cowrace ) MDRV_VIDEO_UPDATE(cowrace) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MDRV_SOUND_ADD("ym", YM2203, 3000000) MDRV_SOUND_CONFIG(ym2203_interface_1) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 7ed8093dbdc..fe7e19789f4 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -2827,14 +2827,14 @@ static MACHINE_DRIVER_START( qsound ) /* sound hardware */ MDRV_SPEAKER_REMOVE("mono") - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_REMOVE("2151") MDRV_SOUND_REMOVE("oki") MDRV_SOUND_ADD("qsound", QSOUND, QSOUND_CLOCK) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* bootlegs with PIC */ diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index 6ab045953d5..f980326a011 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -1258,11 +1258,11 @@ static MACHINE_DRIVER_START( cps2 ) MDRV_VIDEO_UPDATE(cps1) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("qsound", QSOUND, QSOUND_CLOCK) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1282,8 +1282,8 @@ static MACHINE_DRIVER_START( gigamn2 ) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_32MHz/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END /************************************* diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index 18cce2df71c..3346f40dedb 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -2570,11 +2570,11 @@ static MACHINE_DRIVER_START( cps3 ) MDRV_VIDEO_UPDATE(cps3) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("cps3", CPS3, MASTER_CLOCK / 3) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(0, "right", 1.0) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index d9446190d07..27ec6b38337 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -318,19 +318,19 @@ static MACHINE_DRIVER_START( crimfght ) MDRV_VIDEO_UPDATE(crimfght) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) /* verified with PCB */ MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index c0e56b0be0f..7a91a5b0143 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -473,14 +473,14 @@ static MACHINE_DRIVER_START( crshrace ) MDRV_VIDEO_UPDATE(crshrace) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index e845e248287..0fa1f094a8c 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -757,12 +757,12 @@ static MACHINE_DRIVER_START( crystal ) MDRV_PALETTE_INIT(RRRRR_GGGGGG_BBBBB) MDRV_PALETTE_LENGTH(65536) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("vrender", VRENDER0, 0) MDRV_SOUND_CONFIG(vr0_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c index 0eee5c32f93..e1ed07c3dc6 100644 --- a/src/mame/drivers/cubeqst.c +++ b/src/mame/drivers/cubeqst.c @@ -535,44 +535,44 @@ static MACHINE_DRIVER_START( cubeqst ) MDRV_LASERDISC_OVERLAY_POSITION(0.002, -0.018) MDRV_LASERDISC_OVERLAY_SCALE(1.0, 1.030) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("rdac0", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac0", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MDRV_SOUND_ADD("rdac1", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac1", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MDRV_SOUND_ADD("rdac2", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac2", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MDRV_SOUND_ADD("rdac3", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac3", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MDRV_SOUND_ADD("rdac4", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac4", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MDRV_SOUND_ADD("rdac5", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac5", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MDRV_SOUND_ADD("rdac6", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac6", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MDRV_SOUND_ADD("rdac7", DAC, 0) - MDRV_SOUND_ROUTE(0, "right", 0.125) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.125) MDRV_SOUND_ADD("ldac7", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.125) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.125) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index fdd19f1afe1..c2896055854 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -255,17 +255,17 @@ static MACHINE_DRIVER_START( cd32 ) MDRV_VIDEO_UPDATE(amiga) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("amiga", AMIGA, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(1, "right", 0.25) - MDRV_SOUND_ROUTE(2, "right", 0.25) - MDRV_SOUND_ROUTE(3, "left", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.25) MDRV_SOUND_ADD( "cdda", CDDA, 0 ) - MDRV_SOUND_ROUTE( 0, "left", 0.50 ) - MDRV_SOUND_ROUTE( 1, "right", 0.50 ) + MDRV_SOUND_ROUTE( 0, "lspeaker", 0.50 ) + MDRV_SOUND_ROUTE( 1, "rspeaker", 0.50 ) /* cia */ MDRV_CIA8520_ADD("cia_0", AMIGA_68EC020_PAL_CLOCK / 10, cia_0_intf) diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c index c10d09e4bc6..c73f86b1258 100644 --- a/src/mame/drivers/cyberbal.c +++ b/src/mame/drivers/cyberbal.c @@ -419,7 +419,7 @@ static MACHINE_DRIVER_START( cyberbal ) MDRV_CPU_ADD("extra", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(extra_map,0) - MDRV_CPU_VBLANK_INT("left", atarigen_video_int_gen) /* or is it "right?" */ + MDRV_CPU_VBLANK_INT("lscreen", atarigen_video_int_gen) /* or is it "right?" */ MDRV_CPU_ADD("dac", M68000, ATARI_CLOCK_14MHz/2) MDRV_CPU_PROGRAM_MAP(sound_68k_map,0) @@ -435,13 +435,13 @@ static MACHINE_DRIVER_START( cyberbal ) MDRV_GFXDECODE(interleaved) MDRV_PALETTE_LENGTH(4096) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ MDRV_SCREEN_RAW_PARAMS(ATARI_CLOCK_14MHz, 456*2, 0, 336*2, 262, 0, 240) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) /* note: these parameters are from published specs, not derived */ /* the board uses an SOS-2 chip to generate video signals */ @@ -451,18 +451,18 @@ static MACHINE_DRIVER_START( cyberbal ) MDRV_VIDEO_UPDATE(cyberbal) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index c631da91435..228e8b4f37e 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -590,17 +590,17 @@ static MACHINE_DRIVER_START( cybertnk ) MDRV_VIDEO_UPDATE(cybertnk) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", Y8950, 3579500) MDRV_SOUND_CONFIG(y8950_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("ym2", Y8950, 3579500) MDRV_SOUND_CONFIG(y8950_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index cc7b8259fd3..555d6853649 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -841,14 +841,14 @@ static MACHINE_DRIVER_START( darius ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_readmem,darius_writemem) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_CPU_ADD("audiocpu", Z80,8000000/2) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_sound_readmem,darius_sound_writemem) MDRV_CPU_ADD("cpub", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius_cpub_readmem,darius_cpub_writemem) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_CPU_ADD("adpcm", Z80,8000000/2) /* 4 MHz ? */ /* ADPCM player using MSM5205 */ MDRV_CPU_PROGRAM_MAP(darius_sound2_readmem,darius_sound2_writemem) @@ -864,21 +864,21 @@ static MACHINE_DRIVER_START( darius ) MDRV_PALETTE_LENGTH(4096*2) MDRV_DEFAULT_LAYOUT(layout_darius) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(36*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1) - MDRV_SCREEN_ADD("middle", RASTER) + MDRV_SCREEN_ADD("mscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(36*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 1*8, 29*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -889,7 +889,7 @@ static MACHINE_DRIVER_START( darius ) MDRV_VIDEO_UPDATE(darius) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, 4000000) MDRV_SOUND_CONFIG(ym2203_interface_1) @@ -919,43 +919,43 @@ static MACHINE_DRIVER_START( darius ) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "msm5205.r", 1.0) MDRV_SOUND_ADD("filter0.0l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter0.0r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter0.1l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter0.1r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter0.2l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter0.2r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter0.3l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter0.3r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter1.0l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter1.0r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter1.1l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter1.1r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter1.2l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter1.2r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter1.3l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter1.3r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("msm5205.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("msm5205.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 5f8ccd4e914..3328e2ee473 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -584,26 +584,26 @@ static MACHINE_DRIVER_START( dassault ) MDRV_VIDEO_UPDATE(dassault) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, 32220000/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MDRV_SOUND_ADD("ym2", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki1", OKIM6295, 1023924) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("oki2", OKIM6295, 2047848) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) MACHINE_DRIVER_END /**********************************************************************************/ diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 6aa548dff67..841cbc1c551 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -364,17 +364,17 @@ static MACHINE_DRIVER_START( dbz ) MDRV_PALETTE_LENGTH(0x4000/2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END /**********************************************************************************/ diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c index 8c4e9e4312c..b819782b61e 100644 --- a/src/mame/drivers/dcheese.c +++ b/src/mame/drivers/dcheese.c @@ -415,11 +415,11 @@ static MACHINE_DRIVER_START( dcheese ) MDRV_VIDEO_UPDATE(dcheese) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("bsmt", BSMT2000, SOUND_OSC) - MDRV_SOUND_ROUTE(0, "left", 1.2) - MDRV_SOUND_ROUTE(1, "right", 1.2) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.2) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.2) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c index abaa9e19b55..a0b73fa7eb1 100644 --- a/src/mame/drivers/ddragon3.c +++ b/src/mame/drivers/ddragon3.c @@ -630,17 +630,17 @@ static MACHINE_DRIVER_START( ddragon3 ) MDRV_VIDEO_UPDATE(ddragon3) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym2151", YM2151, XTAL_3_579545MHz) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1_056MHz) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50) MACHINE_DRIVER_END static MACHINE_DRIVER_START( ddrago3b ) @@ -662,12 +662,12 @@ static MACHINE_DRIVER_START( ctribe ) MDRV_VIDEO_UPDATE(ctribe) MDRV_SOUND_MODIFY("ym2151") - MDRV_SOUND_ROUTE(0, "left", 1.20) - MDRV_SOUND_ROUTE(1, "right", 1.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.20) MDRV_SOUND_MODIFY("oki") - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_DRIVER_END /************************************* diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c index eaf8febe9cc..7160afb6ecb 100644 --- a/src/mame/drivers/ddz.c +++ b/src/mame/drivers/ddz.c @@ -73,12 +73,12 @@ static MACHINE_DRIVER_START( ddz ) MDRV_VIDEO_UPDATE(ddz) MDRV_VIDEO_EOF(ddz) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("vrender", VRENDER0, 0) MDRV_SOUND_CONFIG(vr0_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index ad74d103354..c7c9430d062 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -396,17 +396,17 @@ static MACHINE_DRIVER_START( hvysmsh ) MDRV_VIDEO_UPDATE(wcvol95) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, 28000000/28) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 28000000/14) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MACHINE_DRIVER_END static MACHINE_DRIVER_START( wcvol95 ) @@ -435,12 +435,12 @@ static MACHINE_DRIVER_START( wcvol95 ) MDRV_VIDEO_UPDATE(wcvol95) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 28000000 / 2) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 22987c9ed05..d8ad65ac2f7 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -1888,22 +1888,22 @@ static MACHINE_DRIVER_START( captaven ) MDRV_VIDEO_UPDATE(captaven) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.42) - MDRV_SOUND_ROUTE(1, "right", 0.42) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MACHINE_DRIVER_END static MACHINE_DRIVER_START( fghthist ) @@ -1934,22 +1934,22 @@ static MACHINE_DRIVER_START( fghthist ) MDRV_VIDEO_UPDATE(fghthist) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.42) - MDRV_SOUND_ROUTE(1, "right", 0.42) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MACHINE_DRIVER_END static MACHINE_DRIVER_START( fghthsta ) @@ -1980,22 +1980,22 @@ static MACHINE_DRIVER_START( fghthsta ) MDRV_VIDEO_UPDATE(fghthist) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.42) - MDRV_SOUND_ROUTE(1, "right", 0.42) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MACHINE_DRIVER_END static MACHINE_DRIVER_START( dragngun ) @@ -2028,27 +2028,27 @@ static MACHINE_DRIVER_START( dragngun ) MDRV_VIDEO_EOF(dragngun) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.42) - MDRV_SOUND_ROUTE(1, "right", 0.42) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MDRV_SOUND_ADD("oki3", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( lockload ) @@ -2081,27 +2081,27 @@ static MACHINE_DRIVER_START( lockload ) MDRV_VIDEO_EOF(dragngun) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.42) - MDRV_SOUND_ROUTE(1, "right", 0.42) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.42) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.42) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MDRV_SOUND_ADD("oki3", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( tattass ) @@ -2133,11 +2133,11 @@ static MACHINE_DRIVER_START( tattass ) MDRV_VIDEO_UPDATE(nslasher) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("bsmt", BSMT2000, 24000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( nslasher ) @@ -2171,22 +2171,22 @@ static MACHINE_DRIVER_START( nslasher ) MDRV_VIDEO_UPDATE(nslasher) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_interface_nslasher) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MACHINE_DRIVER_END /**********************************************************************************/ diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index 54fa3f1e8e7..d5fa61efa09 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -416,11 +416,11 @@ static MACHINE_DRIVER_START( avengrgs ) MDRV_VIDEO_EOF(mlc) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 42000000 / 3) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( mlc ) @@ -447,11 +447,11 @@ static MACHINE_DRIVER_START( mlc ) MDRV_VIDEO_EOF(mlc) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 42000000 / 3) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( mlc_6bpp ) diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 8a726e7998f..8a0cb1ddfc3 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -1060,17 +1060,17 @@ static MACHINE_DRIVER_START( djmain ) MDRV_VIDEO_UPDATE(djmain) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c index a580ff0dcae..8c80cf38c80 100644 --- a/src/mame/drivers/dlair.c +++ b/src/mame/drivers/dlair.c @@ -706,15 +706,15 @@ static MACHINE_DRIVER_START( dlair_base ) MDRV_LASERDISC_SCREEN_ADD_NTSC("screen", BITMAP_FORMAT_RGB32) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK_US/8) MDRV_SOUND_CONFIG(ay8910_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -759,15 +759,15 @@ static MACHINE_DRIVER_START( dleuro ) MDRV_PALETTE_INIT(dleuro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("beep", BEEP, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) MDRV_SOUND_ADD("laserdisc", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c index c588814d033..91e8f7558a4 100644 --- a/src/mame/drivers/dragrace.c +++ b/src/mame/drivers/dragrace.c @@ -352,12 +352,12 @@ static MACHINE_DRIVER_START( dragrace ) MDRV_VIDEO_UPDATE(dragrace) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(dragrace) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index df7be6e768c..b8e5809da63 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -403,17 +403,17 @@ static MACHINE_DRIVER_START( dreamwld ) MDRV_VIDEO_START(dreamwld) MDRV_VIDEO_UPDATE(dreamwld) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, MASTER_CLOCK/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("oki2", OKIM6295, MASTER_CLOCK/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index 2492c0f5de4..ee6dea2d875 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -403,17 +403,17 @@ static MACHINE_DRIVER_START( drgnmst ) MDRV_VIDEO_UPDATE(drgnmst) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, 32000000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("oki2", OKIM6295, 32000000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c index d8eb5c696d1..ccf93f4dc85 100644 --- a/src/mame/drivers/eolith16.c +++ b/src/mame/drivers/eolith16.c @@ -185,12 +185,12 @@ static MACHINE_DRIVER_START( eolith16 ) MDRV_VIDEO_START(eolith16) MDRV_VIDEO_UPDATE(eolith16) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END /* diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c index 653e4ff1baa..0a574ee05f9 100644 --- a/src/mame/drivers/esh.c +++ b/src/mame/drivers/esh.c @@ -301,11 +301,11 @@ static MACHINE_DRIVER_START( esh ) MDRV_GFXDECODE(esh) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index d49cdfe184d..d6a1a74ecd4 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -146,16 +146,16 @@ static MACHINE_DRIVER_START( mosaicf2 ) MDRV_VIDEO_UPDATE(mosaicf2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 14318180/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 1789772.5) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END /* diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index 8c9f29a293d..54086f7618d 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -498,14 +498,14 @@ static MACHINE_DRIVER_START( f1gp ) MDRV_VIDEO_UPDATE(f1gp) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, XTAL_8MHz) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -537,12 +537,12 @@ static MACHINE_DRIVER_START( f1gpb ) MDRV_VIDEO_UPDATE(f1gpb) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index 131ccee447e..39968ea6731 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -2005,16 +2005,16 @@ static MACHINE_DRIVER_START(firebeat) MDRV_VIDEO_UPDATE(firebeat) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("cdda", CDDA, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2023,7 +2023,7 @@ static MACHINE_DRIVER_START(firebeat2) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", PPC403GCX, 66000000) MDRV_CPU_PROGRAM_MAP(firebeat_map, 0) - MDRV_CPU_VBLANK_INT("left", firebeat_interrupt) + MDRV_CPU_VBLANK_INT("lscreen", firebeat_interrupt) MDRV_MACHINE_RESET(firebeat) MDRV_NVRAM_HANDLER(firebeat) @@ -2032,14 +2032,14 @@ static MACHINE_DRIVER_START(firebeat2) MDRV_PALETTE_LENGTH(32768) MDRV_PALETTE_INIT(RRRRR_GGGGG_BBBBB) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MDRV_SCREEN_SIZE(640, 480) MDRV_SCREEN_VISIBLE_AREA(0, 639, 0, 479) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) @@ -2050,16 +2050,16 @@ static MACHINE_DRIVER_START(firebeat2) MDRV_VIDEO_UPDATE(firebeat) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("cdda", CDDA, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START(firebeat_spu) diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 2a47ededd5d..fd4d396b4af 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -681,31 +681,31 @@ static MACHINE_DRIVER_START( firefox ) MDRV_RIOT6532_ADD("riot", MASTER_XTAL/8, riot_intf) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("pokey1", POKEY, MASTER_XTAL/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("pokey2", POKEY, MASTER_XTAL/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("pokey3", POKEY, MASTER_XTAL/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("pokey4", POKEY, MASTER_XTAL/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("tms", TMS5220, MASTER_XTAL/2/11) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 2ae8eb4e5cc..098b5c4db00 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -308,18 +308,18 @@ static MACHINE_DRIVER_START( flkatck ) MDRV_VIDEO_UPDATE(flkatck) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(0, "right", 0.50) - MDRV_SOUND_ROUTE(1, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 77f2ae32dad..4952118d16d 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -617,7 +617,7 @@ static MACHINE_DRIVER_START( fromanc2 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_main,fromanc2_writemem_main) - MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) + MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt) MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sound,fromanc2_writemem_sound) @@ -636,14 +636,14 @@ static MACHINE_DRIVER_START( fromanc2 ) MDRV_PALETTE_LENGTH(4096) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(512, 512) MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -669,7 +669,7 @@ static MACHINE_DRIVER_START( fromancr ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromancr_readmem_main,fromancr_writemem_main) - MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) + MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt) MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sound,fromanc2_writemem_sound) @@ -687,14 +687,14 @@ static MACHINE_DRIVER_START( fromancr ) MDRV_PALETTE_LENGTH(4096) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(512, 512) MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -720,7 +720,7 @@ static MACHINE_DRIVER_START( fromanc4 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000,32000000/2) /* 16.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc4_readmem_main,fromanc4_writemem_main) - MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt) + MDRV_CPU_VBLANK_INT("lscreen", fromanc2_interrupt) MDRV_CPU_ADD("audiocpu", Z80,32000000/4) /* 8.00 MHz */ MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_sound,fromanc2_writemem_sound) @@ -735,14 +735,14 @@ static MACHINE_DRIVER_START( fromanc4 ) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(2048, 256) MDRV_SCREEN_VISIBLE_AREA(0, 352-1, 0, 240-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index 852fe07f6eb..3f7666f7ed3 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -333,17 +333,17 @@ static MACHINE_DRIVER_START( funkyjet ) MDRV_VIDEO_UPDATE(funkyjet) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, 1000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END /******************************************************************************/ diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index 78723851f59..ff57c6684dd 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -492,21 +492,21 @@ static MACHINE_DRIVER_START( fuuki16 ) MDRV_VIDEO_UPDATE(fuuki16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, 4000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.15) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.15) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.15) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.15) MDRV_SOUND_ADD("ym2", YM3812, 4000000) MDRV_SOUND_CONFIG(fuuki16_ym3812_intf) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.85) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.85) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.85) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.85) MACHINE_DRIVER_END diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index a8604261d3a..c1ae1cfbbdc 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -617,12 +617,12 @@ static MACHINE_DRIVER_START( fuuki32 ) MDRV_VIDEO_EOF(fuuki32) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) /* YMF278B_STD_CLOCK = OSC 33.8688MHz */ MDRV_SOUND_CONFIG(fuuki32_ymf278b_interface) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index 27053e9179f..54227c93681 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -188,12 +188,12 @@ static MACHINE_DRIVER_START( maniacsq ) MDRV_VIDEO_UPDATE(gaelco2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0) MDRV_SOUND_CONFIG(maniacsq_snd_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -318,12 +318,12 @@ static MACHINE_DRIVER_START( bang ) MDRV_VIDEO_UPDATE(gaelco2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("gaelco", GAELCO_CG1V, 0) MDRV_SOUND_CONFIG(bang_snd_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -520,12 +520,12 @@ static MACHINE_DRIVER_START( alighunt ) MDRV_VIDEO_UPDATE(gaelco2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0) MDRV_SOUND_CONFIG(alighunt_snd_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -752,7 +752,7 @@ static MACHINE_DRIVER_START( touchgo ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, 32000000/2) /* 16 MHz */ MDRV_CPU_PROGRAM_MAP(touchgo_readmem, touchgo_writemem) - MDRV_CPU_VBLANK_INT("left", irq6_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq6_line_hold) /* video hardware */ MDRV_VIDEO_ATTRIBUTES(VIDEO_BUFFERS_SPRITERAM) @@ -760,14 +760,14 @@ static MACHINE_DRIVER_START( touchgo ) MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(59.1) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MDRV_SCREEN_SIZE(64*16, 32*16) MDRV_SCREEN_VISIBLE_AREA(0, 480-1, 16, 256-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(59.1) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) @@ -781,11 +781,11 @@ static MACHINE_DRIVER_START( touchgo ) /* sound hardware */ /* the chip is stereo, but the game sound is mono because the right channel output is for cabinet 1 and the left channel output is for cabinet 2 */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0) MDRV_SOUND_CONFIG(touchgo_snd_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* @@ -978,12 +978,12 @@ static MACHINE_DRIVER_START( snowboar ) MDRV_VIDEO_UPDATE(gaelco2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("gaelco", GAELCO_CG1V, 0) MDRV_SOUND_CONFIG(snowboar_snd_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1208,7 +1208,7 @@ static MACHINE_DRIVER_START( wrally2 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, 26000000/2) /* 13 MHz */ MDRV_CPU_PROGRAM_MAP(wrally2_readmem, wrally2_writemem) - MDRV_CPU_VBLANK_INT("left", irq6_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq6_line_hold) MDRV_NVRAM_HANDLER(gaelco2) @@ -1218,14 +1218,14 @@ static MACHINE_DRIVER_START( wrally2 ) MDRV_PALETTE_LENGTH(4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(59.1) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MDRV_SCREEN_SIZE(384, 32*16) MDRV_SCREEN_VISIBLE_AREA(0, 384-1, 16, 256-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(59.1) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) @@ -1240,11 +1240,11 @@ static MACHINE_DRIVER_START( wrally2 ) /* sound hardware */ /* the chip is stereo, but the game sound is mono because the right channel output is for cabinet 1 and the left channel output is for cabinet 2 */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("gaelco", GAELCO_GAE1, 0) MDRV_SOUND_CONFIG(wrally2_snd_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index e0595519429..1be0c5a9b0b 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -493,15 +493,15 @@ static MACHINE_DRIVER_START( galpani2 ) MDRV_VIDEO_UPDATE(galpani2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, 1584000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 1584000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index 350fbb5b039..1211c785797 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -547,19 +547,19 @@ static MACHINE_DRIVER_START( gauntlet ) MDRV_VIDEO_UPDATE(gauntlet) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, ATARI_CLOCK_14MHz/4) - MDRV_SOUND_ROUTE(0, "left", 0.48) - MDRV_SOUND_ROUTE(1, "right", 0.48) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.48) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.48) MDRV_SOUND_ADD("pokey", POKEY, ATARI_CLOCK_14MHz/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.32) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.32) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.32) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.32) MDRV_SOUND_ADD("tms", TMS5220, ATARI_CLOCK_14MHz/2/11) /* potentially ATARI_CLOCK_14MHz/2/9 as well */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c index 17858834709..7e83c426069 100644 --- a/src/mame/drivers/gijoe.c +++ b/src/mame/drivers/gijoe.c @@ -360,16 +360,16 @@ static MACHINE_DRIVER_START( gijoe ) MDRV_VIDEO_UPDATE(gijoe) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("konami", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index ad987a74909..c3794033629 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -311,11 +311,11 @@ static MACHINE_DRIVER_START( go2000 ) MDRV_VIDEO_START(go2000) MDRV_VIDEO_UPDATE(go2000) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END ROM_START( go2000 ) diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 2647977209e..bc130e17444 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -275,12 +275,12 @@ static MACHINE_DRIVER_START( good ) MDRV_VIDEO_START(good) MDRV_VIDEO_UPDATE(good) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index 7334ed8ba8d..af6d5469241 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -461,11 +461,11 @@ static MACHINE_DRIVER_START( gpworld ) MDRV_PALETTE_LENGTH(1024) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c index 80db9ff8367..9df2797ae08 100644 --- a/src/mame/drivers/gradius3.c +++ b/src/mame/drivers/gradius3.c @@ -368,18 +368,18 @@ static MACHINE_DRIVER_START( gradius3 ) MDRV_VIDEO_UPDATE(gradius3) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 2bea997e0bd..d9030067d88 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -587,14 +587,14 @@ static MACHINE_DRIVER_START( gstriker ) MDRV_VIDEO_START(gstriker) MDRV_VIDEO_UPDATE(gstriker) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( twrldc94 ) @@ -627,14 +627,14 @@ static MACHINE_DRIVER_START( vgoal ) MDRV_VIDEO_START(vgoalsoc) MDRV_VIDEO_UPDATE(gstriker) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 3292898fa90..1af1a05888c 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -275,7 +275,7 @@ static VIDEO_UPDATE( hangplt ) { bitmap_fill(bitmap, cliprect, screen->machine->pens[0]); - if (strcmp(screen->tag, "left") == 0) + if (strcmp(screen->tag, "lscreen") == 0) { const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo0"); @@ -285,7 +285,7 @@ static VIDEO_UPDATE( hangplt ) K001604_draw_front_layer(0, bitmap, cliprect); } - else if (strcmp(screen->tag, "right") == 0) + else if (strcmp(screen->tag, "rscreen") == 0) { const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo1"); @@ -939,11 +939,11 @@ static MACHINE_DRIVER_START( gticlub ) MDRV_VIDEO_START(gticlub) MDRV_VIDEO_UPDATE(gticlub) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("rf", RF5C400, 64000000/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_RESET( hangplt ) @@ -975,13 +975,13 @@ static MACHINE_DRIVER_START( hangplt ) MDRV_MACHINE_START(gticlub) MDRV_MACHINE_RESET(hangplt) - MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "left") + MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "lscreen") MDRV_3DFX_VOODOO_CPU("dsp1") MDRV_3DFX_VOODOO_TMU_MEMORY(0, 2) MDRV_3DFX_VOODOO_TMU_MEMORY(1, 2) MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0) - MDRV_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "right") + MDRV_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "rscreen") MDRV_3DFX_VOODOO_CPU("dsp2") MDRV_3DFX_VOODOO_TMU_MEMORY(0, 2) MDRV_3DFX_VOODOO_TMU_MEMORY(1, 2) @@ -990,13 +990,13 @@ static MACHINE_DRIVER_START( hangplt ) /* video hardware */ MDRV_PALETTE_LENGTH(65536) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_SIZE(512, 384) MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_SIZE(512, 384) @@ -1005,11 +1005,11 @@ static MACHINE_DRIVER_START( hangplt ) MDRV_VIDEO_START(hangplt) MDRV_VIDEO_UPDATE(hangplt) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("rf", RF5C400, 64000000/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************/ diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c index 28585032328..d2387371e13 100644 --- a/src/mame/drivers/gumbo.c +++ b/src/mame/drivers/gumbo.c @@ -280,12 +280,12 @@ static MACHINE_DRIVER_START( gumbo ) MDRV_VIDEO_START(gumbo) MDRV_VIDEO_UPDATE(gumbo) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1122000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END static MACHINE_DRIVER_START( mspuzzle ) diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c index 17c9aab7618..48ddc9df665 100644 --- a/src/mame/drivers/gyruss.c +++ b/src/mame/drivers/gyruss.c @@ -539,7 +539,7 @@ static MACHINE_DRIVER_START( gyruss ) MDRV_VIDEO_UPDATE(gyruss) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ay1", AY8910, 14318180/8) MDRV_SOUND_CONFIG(ay8910_interface_1) @@ -573,8 +573,8 @@ static MACHINE_DRIVER_START( gyruss ) MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(gyruss_sound) - MDRV_SOUND_ROUTE(0, "right", 1.0) - MDRV_SOUND_ROUTE(1, "left", 1.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index ac927781cc4..59c36b6f7be 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -1130,13 +1130,13 @@ static MACHINE_DRIVER_START( ds4 ) // MDRV_CPU_ADD("sounddsp", ADSP2105, 10000000) // MDRV_CPU_PROGRAM_MAP(ds3snd_program_map,0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c index c214485854c..82c7f8869cd 100644 --- a/src/mame/drivers/hikaru.c +++ b/src/mame/drivers/hikaru.c @@ -334,11 +334,11 @@ static MACHINE_DRIVER_START( hikaru ) MDRV_VIDEO_START(hikaru) MDRV_VIDEO_UPDATE(hikaru) -// MDRV_SPEAKER_STANDARD_STEREO("left", "right") +// MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // MDRV_SOUND_ADD("aica", AICA, 0) // MDRV_SOUND_CONFIG(aica_config) -// MDRV_SOUND_ROUTE(0, "left", 2.0) -// MDRV_SOUND_ROUTE(0, "right", 2.0) +// MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) +// MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index cdb65039f2f..93672f13d8d 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -603,7 +603,7 @@ static VIDEO_UPDATE( hornet ) static VIDEO_UPDATE( hornet_2board ) { - if (strcmp(screen->tag, "left") == 0) + if (strcmp(screen->tag, "lscreen") == 0) { const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo0"); voodoo_update(voodoo, bitmap, cliprect); @@ -611,7 +611,7 @@ static VIDEO_UPDATE( hornet_2board ) /* TODO: tilemaps per screen */ K037122_tile_draw(screen->machine, 0, bitmap, cliprect); } - else if (strcmp(screen->tag, "right") == 0) + else if (strcmp(screen->tag, "rscreen") == 0) { const device_config *voodoo = device_list_find_by_tag(screen->machine->config->devicelist, VOODOO_GRAPHICS, "voodoo1"); voodoo_update(voodoo, bitmap, cliprect); @@ -1042,11 +1042,11 @@ static MACHINE_DRIVER_START( hornet ) MDRV_VIDEO_START(hornet) MDRV_VIDEO_UPDATE(hornet) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("rf", RF5C400, 64000000/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_M48T58_ADD( "m48t58" ) MACHINE_DRIVER_END @@ -1082,12 +1082,12 @@ static MACHINE_DRIVER_START( hornet_2board ) MDRV_VIDEO_UPDATE(hornet_2board) MDRV_3DFX_VOODOO_REMOVE("voodoo0") - MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "left") + MDRV_3DFX_VOODOO_1_ADD("voodoo0", STD_VOODOO_1_CLOCK, 2, "lscreen") MDRV_3DFX_VOODOO_CPU("dsp") MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4) MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0) - MDRV_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "right") + MDRV_3DFX_VOODOO_1_ADD("voodoo1", STD_VOODOO_1_CLOCK, 2, "rscreen") MDRV_3DFX_VOODOO_CPU("dsp2") MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4) MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_1) @@ -1097,13 +1097,13 @@ static MACHINE_DRIVER_START( hornet_2board ) MDRV_SCREEN_REMOVE("screen") - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_SIZE(512, 384) MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 383) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_SIZE(512, 384) @@ -1114,13 +1114,13 @@ static MACHINE_DRIVER_START( hornet_2board_v2 ) MDRV_IMPORT_FROM(hornet_2board) MDRV_3DFX_VOODOO_REMOVE("voodoo0") - MDRV_3DFX_VOODOO_2_ADD("voodoo0", STD_VOODOO_2_CLOCK, 2, "left") + MDRV_3DFX_VOODOO_2_ADD("voodoo0", STD_VOODOO_2_CLOCK, 2, "lscreen") MDRV_3DFX_VOODOO_CPU("dsp") MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4) MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_0) MDRV_3DFX_VOODOO_REMOVE("voodoo1") - MDRV_3DFX_VOODOO_2_ADD("voodoo1", STD_VOODOO_2_CLOCK, 2, "right") + MDRV_3DFX_VOODOO_2_ADD("voodoo1", STD_VOODOO_2_CLOCK, 2, "rscreen") MDRV_3DFX_VOODOO_CPU("dsp2") MDRV_3DFX_VOODOO_TMU_MEMORY(0, 4) MDRV_3DFX_VOODOO_VBLANK(voodoo_vblank_1) diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index 6bd6a4af169..1dee7b34d93 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -742,17 +742,17 @@ static MACHINE_DRIVER_START( hyprduel ) MDRV_VIDEO_UPDATE(hyprduel) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, 4000000/16/16*132) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.57) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.57) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57) MACHINE_DRIVER_END @@ -783,16 +783,16 @@ static MACHINE_DRIVER_START( magerror ) MDRV_VIDEO_UPDATE(hyprduel) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.57) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.57) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57) MDRV_SOUND_ADD("oki", OKIM6295, 4000000/16/16*132) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.57) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.57) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.57) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.57) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/igs_m68.c b/src/mame/drivers/igs_m68.c index e047c44f82d..f8160a32c42 100644 --- a/src/mame/drivers/igs_m68.c +++ b/src/mame/drivers/igs_m68.c @@ -60,12 +60,12 @@ static MACHINE_DRIVER_START( igs_m68 ) MDRV_VIDEO_START(igs_m68) MDRV_VIDEO_UPDATE(igs_m68) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 8000000/8) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END /* diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c index 8aea3ce24e2..a44d5e3fb4f 100644 --- a/src/mame/drivers/istellar.c +++ b/src/mame/drivers/istellar.c @@ -352,11 +352,11 @@ static MACHINE_DRIVER_START( istellar ) MDRV_GFXDECODE(istellar) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index 3bf2e5785a1..d3bce967b45 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -327,11 +327,11 @@ static MACHINE_DRIVER_START( jackal ) MDRV_VIDEO_UPDATE(jackal) // sound hardware - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) // verified on pcb - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END /* ROMs */ diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index 9860126484b..b4d87a9f4fa 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -36,8 +36,8 @@ static VIDEO_START(jackpool) static VIDEO_UPDATE(jackpool) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); const gfx_element *gfx = screen->machine->gfx[0]; int count;// = 0x00000/2; @@ -254,19 +254,19 @@ static INTERRUPT_GEN( jackpool_interrupt ) static MACHINE_DRIVER_START( jackpool ) MDRV_CPU_ADD("maincpu", M68000, 12000000) // ? MDRV_CPU_PROGRAM_MAP(jackpool_mem,0) - MDRV_CPU_VBLANK_INT("left",jackpool_interrupt) // ? + MDRV_CPU_VBLANK_INT("lscreen",jackpool_interrupt) // ? MDRV_GFXDECODE(jackpool) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_SIZE(64*8, 64*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 32*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index ed5b49b6044..d6b442f969c 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -682,12 +682,12 @@ static MACHINE_DRIVER_START( jchan ) MDRV_VIDEO_UPDATE(jchan) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16000000) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* rom loading */ diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index b98965f63cd..6d7800493e6 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -1670,19 +1670,19 @@ static MACHINE_DRIVER_START( berlwall ) MDRV_VIDEO_UPDATE(berlwall) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ay1", AY8910, 1000000) MDRV_SOUND_CONFIG(ay8910_intf_dsw) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("ay2", AY8910, 1000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 12000000/6) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1776,11 +1776,11 @@ static MACHINE_DRIVER_START( blazeon ) MDRV_VIDEO_UPDATE(kaneko16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c index 277efec89bf..2733e472ee3 100644 --- a/src/mame/drivers/koftball.c +++ b/src/mame/drivers/koftball.c @@ -220,12 +220,12 @@ static MACHINE_DRIVER_START( koftball ) MDRV_VIDEO_START(koftball) MDRV_VIDEO_UPDATE(koftball) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1122000) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) /* clock frequency & pin 7 not verified */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END ROM_START( koftball ) diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 6a8b5bc2798..10134488d1f 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -413,17 +413,17 @@ static MACHINE_DRIVER_START( konamigq ) MDRV_VIDEO_UPDATE( psx ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static INPUT_PORTS_START( konamigq ) diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index ce1e884c25e..2d9e53573b6 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -369,16 +369,16 @@ static MACHINE_DRIVER_START( konamigv ) MDRV_VIDEO_UPDATE( psx ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD( "spu", PSXSPU, 0 ) MDRV_SOUND_CONFIG( konamigv_psxspu_interface ) - MDRV_SOUND_ROUTE( 0, "left", 0.75 ) - MDRV_SOUND_ROUTE( 1, "right", 0.75 ) + MDRV_SOUND_ROUTE( 0, "lspeaker", 0.75 ) + MDRV_SOUND_ROUTE( 1, "rspeaker", 0.75 ) MDRV_SOUND_ADD( "cdda", CDDA, 0 ) - MDRV_SOUND_ROUTE( 0, "left", 1.0 ) - MDRV_SOUND_ROUTE( 1, "right", 1.0 ) + MDRV_SOUND_ROUTE( 0, "lspeaker", 1.0 ) + MDRV_SOUND_ROUTE( 1, "rspeaker", 1.0 ) MACHINE_DRIVER_END static INPUT_PORTS_START( konamigv ) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index 66fc71b9136..9ff6b60e5d7 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1376,17 +1376,17 @@ static MACHINE_DRIVER_START( konamigx ) MDRV_VIDEO_UPDATE(konamigx) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( dragoonj ) diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index d5347ac702e..19532204304 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -2806,16 +2806,16 @@ static MACHINE_DRIVER_START( konami573 ) MDRV_VIDEO_UPDATE( psx ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD( "spu", PSXSPU, 0 ) MDRV_SOUND_CONFIG( konami573_psxspu_interface ) - MDRV_SOUND_ROUTE( 0, "left", 1.0 ) - MDRV_SOUND_ROUTE( 1, "right", 1.0 ) + MDRV_SOUND_ROUTE( 0, "lspeaker", 1.0 ) + MDRV_SOUND_ROUTE( 1, "rspeaker", 1.0 ) MDRV_SOUND_ADD( "cdda", CDDA, 0 ) - MDRV_SOUND_ROUTE( 0, "left", 1.0 ) - MDRV_SOUND_ROUTE( 1, "right", 1.0 ) + MDRV_SOUND_ROUTE( 0, "lspeaker", 1.0 ) + MDRV_SOUND_ROUTE( 1, "rspeaker", 1.0 ) MDRV_M48T58_ADD( "m48t58" ) MACHINE_DRIVER_END diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index 7eed1447f33..9cf07454dc0 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -293,17 +293,17 @@ static MACHINE_DRIVER_START( lemmings ) MDRV_VIDEO_UPDATE(lemmings) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, 1023924) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END /******************************************************************************/ diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index 4159ee3292e..e562b0fd45d 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -641,12 +641,12 @@ static MACHINE_DRIVER_START( lethalen ) MDRV_VIDEO_UPDATE(lethalen) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( lethalej ) diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c index beed5dd8f76..854bb5240b2 100644 --- a/src/mame/drivers/lgp.c +++ b/src/mame/drivers/lgp.c @@ -364,11 +364,11 @@ static MACHINE_DRIVER_START( lgp ) MDRV_GFXDECODE(lgp) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c index d64ea0c0a33..2c06661be6a 100644 --- a/src/mame/drivers/lockon.c +++ b/src/mame/drivers/lockon.c @@ -489,12 +489,12 @@ static MACHINE_DRIVER_START( lockon ) MDRV_VIDEO_UPDATE(lockon) MDRV_VIDEO_EOF(lockon) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2203, XTAL_16MHz / 4) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(0, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.40) MDRV_SOUND_ROUTE(1, "f2203.1l", 1.0) MDRV_SOUND_ROUTE(1, "f2203.1r", 1.0) MDRV_SOUND_ROUTE(2, "f2203.2l", 1.0) @@ -503,17 +503,17 @@ static MACHINE_DRIVER_START( lockon ) MDRV_SOUND_ROUTE(3, "f2203.3r", 1.0) MDRV_SOUND_ADD("f2203.1l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("f2203.1r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("f2203.2l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("f2203.2r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("f2203.3l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("f2203.3r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 243f297c5f4..128c2c1d0a3 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -461,17 +461,17 @@ static MACHINE_DRIVER_START( lordgun ) MDRV_VIDEO_UPDATE(lordgun) // sound hardware - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, 3579545) MDRV_SOUND_CONFIG(lordgun_ym3812_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 1000000) // 5MHz can't be right! MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -486,8 +486,8 @@ static MACHINE_DRIVER_START( hfh ) // sound hardware MDRV_SOUND_ADD("oki2", OKIM6295, 1000000) // 5MHz can't be right! MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index 6467cd844d4..1a1a6270292 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -464,16 +464,16 @@ static MACHINE_DRIVER_START( firebarr ) MDRV_VIDEO_UPDATE(m107) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 14318180/4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) MDRV_SOUND_ADD("irem", IREMGA20, 14318180/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static const nec_config dsoccr94_config ={ dsoccr94_decryption_table, }; diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index 6f3610b14c5..5d1d2793720 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -1814,12 +1814,12 @@ static MACHINE_DRIVER_START( rtype ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( m72_base ) @@ -1848,16 +1848,16 @@ static MACHINE_DRIVER_START( m72_base ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( m72 ) @@ -1908,16 +1908,16 @@ static MACHINE_DRIVER_START( dkgenm72 ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -1949,16 +1949,16 @@ static MACHINE_DRIVER_START( xmultipl ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -1990,16 +1990,16 @@ static MACHINE_DRIVER_START( dbreed ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( dbreed72 ) @@ -2030,16 +2030,16 @@ static MACHINE_DRIVER_START( dbreed72 ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -2071,16 +2071,16 @@ static MACHINE_DRIVER_START( rtype2 ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( majtitle ) @@ -2111,16 +2111,16 @@ static MACHINE_DRIVER_START( majtitle ) MDRV_VIDEO_UPDATE(majtitle) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( hharry ) @@ -2151,16 +2151,16 @@ static MACHINE_DRIVER_START( hharry ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -2192,16 +2192,16 @@ static MACHINE_DRIVER_START( hharryu ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -2233,16 +2233,16 @@ static MACHINE_DRIVER_START( poundfor ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( cosmccop ) @@ -2273,16 +2273,16 @@ static MACHINE_DRIVER_START( cosmccop ) MDRV_VIDEO_UPDATE(m72) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static const nec_config kengo_config ={ gunforce_decryption_table, }; diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c index 39d4110ceef..f224e551c63 100644 --- a/src/mame/drivers/macrossp.c +++ b/src/mame/drivers/macrossp.c @@ -651,12 +651,12 @@ static MACHINE_DRIVER_START( macrossp ) MDRV_VIDEO_UPDATE(macrossp) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ensoniq", ES5506, 16000000) MDRV_SOUND_CONFIG(es5506_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( quizmoon ) diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 1d448034be0..8a04a8ceefd 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -369,12 +369,12 @@ static MACHINE_DRIVER_START( macs ) MDRV_VIDEO_START(st0016) MDRV_VIDEO_UPDATE(st0016) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("st", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 7a40998c730..18d1530263b 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -491,14 +491,14 @@ static MACHINE_DRIVER_START( mcatadv ) MDRV_VIDEO_UPDATE(mcatadv) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(mcatadv_ym2610_interface) - MDRV_SOUND_ROUTE(0, "left", 0.32) - MDRV_SOUND_ROUTE(0, "right", 0.32) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.32) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.32) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( nost ) diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index 1cdc9277633..13333aa4ae8 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -1571,8 +1571,8 @@ static MACHINE_DRIVER_START( mcr_91475 ) /* sound hardware */ MDRV_SOUND_ADD("samples", SAMPLES, 0) MDRV_SOUND_CONFIG(journey_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 6fdda178752..1d6e7ad72b1 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -1068,13 +1068,13 @@ static MACHINE_DRIVER_START(mediagx) MDRV_VIDEO_UPDATE(mediagx) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("dac2", DMADAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static void set_gate_a20(running_machine *machine, int a20) diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index d347cee70d5..4e8c5b992a1 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -6252,16 +6252,16 @@ MACHINE_DRIVER_START( megadriv ) MDRV_VIDEO_EOF(megadriv) /* Used to Sync the timing */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2612, MASTER_CLOCK_NTSC/7) /* 7.67 MHz */ - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK_NTSC/15) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) /* 3.58 MHz */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right",0.25) /* 3.58 MHz */ + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ MACHINE_DRIVER_END /************ PAL hardware has a different master clock *************/ @@ -6296,16 +6296,16 @@ MACHINE_DRIVER_START( megadpal ) MDRV_VIDEO_EOF(megadriv) /* Used to Sync the timing */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2612, MASTER_CLOCK_PAL/7) /* 7.67 MHz */ - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) /* sound hardware */ MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK_PAL/15) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) /* 3.58 MHz */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right",0.25) /* 3.58 MHz */ + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ MACHINE_DRIVER_END diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 197c6154170..e428924986c 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -784,8 +784,8 @@ static MACHINE_DRIVER_START( mpnew ) MDRV_QUANTUM_TIME(HZ(6000)) MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) /* 3.58 MHz */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right",0.25) /* 3.58 MHz */ + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) /* 3.58 MHz */ + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker",0.25) /* 3.58 MHz */ /* New update functions to handle the extra layer */ MDRV_VIDEO_START(megplay) diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index c411f4da565..4d230e8658a 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -1543,22 +1543,22 @@ static MACHINE_DRIVER_START( system_A ) MDRV_VIDEO_UPDATE(megasys1) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK/2) /* 3.5MHz (7MHz / 2) verified */ MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki1", OKIM6295, OKI4_SOUND_CLOCK) /* 4MHz verified */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("oki2", OKIM6295, OKI4_SOUND_CLOCK) /* 4MHz verified */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MACHINE_DRIVER_END static MACHINE_DRIVER_START( system_A_hachoo ) @@ -1587,13 +1587,13 @@ static MACHINE_DRIVER_START( system_B_hayaosi1 ) MDRV_SOUND_REPLACE("oki1",OKIM6295, 2000000) /* correct speed, but unknown OSC + divider combo */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_REPLACE("oki2",OKIM6295, 2000000) /* correct speed, but unknown OSC + divider combo */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 31a0dddc57f..5590ccf8752 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -641,8 +641,8 @@ static MACHINE_DRIVER_START( megatech ) /* sound hardware */ MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 8cb49fd7b5d..d4b26aa78e4 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -3775,12 +3775,12 @@ static MACHINE_DRIVER_START( balcube ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) MDRV_SOUND_CONFIG(ymf278b_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -3808,12 +3808,12 @@ static MACHINE_DRIVER_START( daitoa ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) MDRV_SOUND_CONFIG(ymf278b_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( bangball ) @@ -3840,12 +3840,12 @@ static MACHINE_DRIVER_START( bangball ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) MDRV_SOUND_CONFIG(ymf278b_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -3873,12 +3873,12 @@ static MACHINE_DRIVER_START( batlbubl ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) MDRV_SOUND_CONFIG(ymf278b_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( daitorid ) @@ -3910,17 +3910,17 @@ static MACHINE_DRIVER_START( daitorid ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -3953,16 +3953,16 @@ static MACHINE_DRIVER_START( dharma ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -3995,16 +3995,16 @@ static MACHINE_DRIVER_START( karatour ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4037,16 +4037,16 @@ static MACHINE_DRIVER_START( 3kokushi ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4079,16 +4079,16 @@ static MACHINE_DRIVER_START( lastfort ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END static MACHINE_DRIVER_START( lastforg ) @@ -4120,16 +4120,16 @@ static MACHINE_DRIVER_START( lastforg ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END static MACHINE_DRIVER_START( dokyusei ) @@ -4156,16 +4156,16 @@ static MACHINE_DRIVER_START( dokyusei ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2413, 8000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END static NVRAM_HANDLER( dokyusp ) @@ -4207,16 +4207,16 @@ static MACHINE_DRIVER_START( dokyusp ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2413, 8000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4245,16 +4245,16 @@ static MACHINE_DRIVER_START( gakusai ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2413, 8000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4283,16 +4283,16 @@ static MACHINE_DRIVER_START( gakusai2 ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2413, 8000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4325,16 +4325,16 @@ static MACHINE_DRIVER_START( pangpoms ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4367,16 +4367,16 @@ static MACHINE_DRIVER_START( poitto ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4409,17 +4409,17 @@ static MACHINE_DRIVER_START( pururun ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -4452,16 +4452,16 @@ static MACHINE_DRIVER_START( skyalert ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4494,16 +4494,16 @@ static MACHINE_DRIVER_START( toride2g ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1200000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // was /128.. so pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) MACHINE_DRIVER_END @@ -4531,15 +4531,15 @@ static MACHINE_DRIVER_START( mouja ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 16000000/1024*132) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) MDRV_SOUND_ADD("ym", YM2413, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) MACHINE_DRIVER_END @@ -4571,14 +4571,14 @@ static MACHINE_DRIVER_START( blzntrnd ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END /* like blzntrnd but new vidstart / gfxdecode for the different bg tilemap */ @@ -4610,14 +4610,14 @@ static MACHINE_DRIVER_START( gstrik2 ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(blzntrnd_ym2610_interface) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -4677,16 +4677,16 @@ static MACHINE_DRIVER_START( puzzlet ) MDRV_VIDEO_UPDATE(metro) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, XTAL_20MHz/5) MDRV_SOUND_CONFIG(okim6295_interface_pin7low) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2413, XTAL_20MHz/5) - MDRV_SOUND_ROUTE(0, "left", 0.90) - MDRV_SOUND_ROUTE(1, "right", 0.90) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.90) MACHINE_DRIVER_END diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c index 4e56b3e191f..102aaf35852 100644 --- a/src/mame/drivers/micro3d.c +++ b/src/mame/drivers/micro3d.c @@ -672,15 +672,15 @@ static MACHINE_DRIVER_START( micro3d ) MDRV_VIDEO_UPDATE(tms340x0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("upd7759", UPD7759, XTAL_640kHz) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym2151", YM2151, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 94926008212..2f85bc6c101 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -455,11 +455,11 @@ static MACHINE_DRIVER_START( livequiz ) MDRV_VIDEO_UPDATE(livequiz) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) MDRV_SOUND_CONFIG(ymz280b_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index b0945620249..24414d4e981 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -1472,19 +1472,19 @@ static MACHINE_DRIVER_START( model1 ) MDRV_VIDEO_UPDATE(model1) MDRV_VIDEO_EOF(model1) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3438, 8000000) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model1_vr ) @@ -1515,19 +1515,19 @@ static MACHINE_DRIVER_START( model1_vr ) MDRV_VIDEO_UPDATE(model1) MDRV_VIDEO_EOF(model1) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3438, 8000000) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END GAME( 1993, vf, 0, model1, vf, 0, ROT0, "Sega", "Virtua Fighter", GAME_IMPERFECT_GRAPHICS ) diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 89efa5f4a82..aed072ae917 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1762,19 +1762,19 @@ static MACHINE_DRIVER_START( model2o ) MDRV_VIDEO_START(model2) MDRV_VIDEO_UPDATE(model2) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3438, 8000000) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("sega1", MULTIPCM, 8000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("sega2", MULTIPCM, 8000000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* 2A-CRX */ @@ -1807,12 +1807,12 @@ static MACHINE_DRIVER_START( model2a ) MDRV_VIDEO_START(model2) MDRV_VIDEO_UPDATE(model2) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END @@ -1857,12 +1857,12 @@ static MACHINE_DRIVER_START( model2b ) MDRV_VIDEO_START(model2) MDRV_VIDEO_UPDATE(model2) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END /* 2C-CRX */ @@ -1891,12 +1891,12 @@ static MACHINE_DRIVER_START( model2c ) MDRV_VIDEO_START(model2) MDRV_VIDEO_UPDATE(model2) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END /* ROM definitions */ diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 5380bf9c270..8ad0c7ded56 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -4358,16 +4358,16 @@ static MACHINE_DRIVER_START( model3_10 ) MDRV_VIDEO_START(model3) MDRV_VIDEO_UPDATE(model3) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp1", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MDRV_SOUND_ADD("scsp2", SCSP, 0) MDRV_SOUND_CONFIG(scsp2_interface) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model3_15 ) @@ -4396,16 +4396,16 @@ static MACHINE_DRIVER_START( model3_15 ) MDRV_VIDEO_START(model3) MDRV_VIDEO_UPDATE(model3) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp1", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MDRV_SOUND_ADD("scsp2", SCSP, 0) MDRV_SOUND_CONFIG(scsp2_interface) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model3_20 ) @@ -4434,16 +4434,16 @@ static MACHINE_DRIVER_START( model3_20 ) MDRV_VIDEO_START(model3) MDRV_VIDEO_UPDATE(model3) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp1", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MDRV_SOUND_ADD("scsp2", SCSP, 0) MDRV_SOUND_CONFIG(scsp2_interface) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( model3_21 ) @@ -4473,16 +4473,16 @@ static MACHINE_DRIVER_START( model3_21 ) MDRV_VIDEO_START(model3) MDRV_VIDEO_UPDATE(model3) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp1", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MDRV_SOUND_ADD("scsp2", SCSP, 0) MDRV_SOUND_CONFIG(scsp2_interface) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END static void interleave_vroms(running_machine *machine) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index 9657efccda0..7225f742fc4 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -227,13 +227,13 @@ static MACHINE_DRIVER_START( mogura ) MDRV_VIDEO_UPDATE(mogura) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END ROM_START( mogura ) diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index fe9b5751c10..8dbbe76afc4 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -596,15 +596,15 @@ static MACHINE_DRIVER_START( moo ) MDRV_VIDEO_UPDATE(moo) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("konami", K054539, 48000) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END static MACHINE_DRIVER_START( moobl ) @@ -634,12 +634,12 @@ static MACHINE_DRIVER_START( moobl ) MDRV_VIDEO_UPDATE(moo) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( bucky ) diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 74aa8fe28fa..e2159d25459 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -1712,10 +1712,10 @@ static MACHINE_DRIVER_START( mpu4_vid ) MDRV_SOUND_CONFIG(ay8910_config) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SPEAKER_STANDARD_STEREO("left", "right")/* Present on all video cards */ + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")/* Present on all video cards */ MDRV_SOUND_ADD("saa", SAA1099, 8000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.00) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.00) /* ACIAs */ MDRV_ACIA6850_ADD("acia6850_0", m6809_acia_if) diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c index a1efb5f9ebf..cfb264cb8fc 100644 --- a/src/mame/drivers/mpu5.c +++ b/src/mame/drivers/mpu5.c @@ -51,7 +51,7 @@ static MACHINE_DRIVER_START( mpu5 ) MDRV_VIDEO_START(mpu5) MDRV_VIDEO_UPDATE(mpu5) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* unknown sound */ MACHINE_DRIVER_END diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index c1a45838d60..9bdcf734da9 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -376,20 +376,20 @@ static MACHINE_DRIVER_START( mquake ) MDRV_VIDEO_UPDATE(amiga) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("amiga", AMIGA, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) - MDRV_SOUND_ROUTE(2, "right", 0.50) - MDRV_SOUND_ROUTE(3, "left", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.50) MDRV_SOUND_ADD("ensoniq", ES5503, 7159090) /* ES5503 is likely mono due to channel strobe used as bank select */ MDRV_SOUND_CONFIG(es5503_intf) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(0, "right", 0.50) - MDRV_SOUND_ROUTE(1, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) /* cia */ MDRV_CIA8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf) diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index bc15ce08120..4fda9297c6b 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -1235,11 +1235,11 @@ static MACHINE_DRIVER_START( ms32 ) MDRV_VIDEO_UPDATE(ms32) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF271, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c index 3060afa7bbc..65a391fb11d 100644 --- a/src/mame/drivers/mugsmash.c +++ b/src/mame/drivers/mugsmash.c @@ -448,17 +448,17 @@ static MACHINE_DRIVER_START( mugsmash ) MDRV_VIDEO_START(mugsmash) MDRV_VIDEO_UPDATE(mugsmash) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.00) /* music */ - MDRV_SOUND_ROUTE(1, "right", 1.00) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) /* music */ + MDRV_SOUND_ROUTE(1, "rspeaker", 1.00) MDRV_SOUND_ADD("oki", OKIM6295, 1122000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) /* sound fx */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) /* sound fx */ + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END ROM_START( mugsmash ) diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index c09112097d9..e9c5c04dba4 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -973,17 +973,17 @@ static MACHINE_DRIVER_START( mystwarr ) MDRV_VIDEO_UPDATE(mystwarr) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "right", 1.0) /* stereo channels are inverted */ - MDRV_SOUND_ROUTE(1, "left", 1.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */ + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "right", 1.0) /* stereo channels are inverted */ - MDRV_SOUND_ROUTE(1, "left", 1.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) /* stereo channels are inverted */ + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( viostorm ) diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index f9a974a8fd5..41503cf9e35 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -1036,12 +1036,12 @@ static MACHINE_DRIVER_START( namcona1 ) MDRV_VIDEO_UPDATE(namcona1) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 44100) MDRV_SOUND_CONFIG(C140_interface_typeA) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) MACHINE_DRIVER_END diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index 3cf3e730ae2..c0a959dca44 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -1023,12 +1023,12 @@ static MACHINE_DRIVER_START( namconb1 ) MDRV_VIDEO_START(namconb1) MDRV_VIDEO_UPDATE(namconb1) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_DRIVER_END static MACHINE_DRIVER_START( namconb2 ) @@ -1056,12 +1056,12 @@ static MACHINE_DRIVER_START( namconb2 ) MDRV_VIDEO_START(namconb2) MDRV_VIDEO_UPDATE(namconb2) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, MASTER_CLOCK_HZ/3) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_DRIVER_END /***************************************************************/ diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c index af82fdb813a..3983c3c98ba 100644 --- a/src/mame/drivers/namcond1.c +++ b/src/mame/drivers/namcond1.c @@ -314,13 +314,13 @@ static MACHINE_DRIVER_START( namcond1 ) MDRV_VIDEO_UPDATE(ygv608) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, 16384000) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MDRV_AT28C16_ADD( "at28c16", NULL ) MACHINE_DRIVER_END diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 13da09e990b..1c7fc528267 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -1012,21 +1012,21 @@ static MACHINE_DRIVER_START( ns1 ) MDRV_VIDEO_EOF(namcos1) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579580) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048/2) MDRV_SOUND_CONFIG(namco_config) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c index ebf4fda5fcb..f2b6b2ed43a 100644 --- a/src/mame/drivers/namcos10.c +++ b/src/mame/drivers/namcos10.c @@ -398,7 +398,7 @@ static MACHINE_DRIVER_START( namcos10 ) MDRV_VIDEO_UPDATE( psx ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MACHINE_DRIVER_END static INPUT_PORTS_START( namcos10 ) diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index cd3515a4037..55448387d03 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1503,13 +1503,13 @@ static MACHINE_DRIVER_START( coh700 ) MDRV_VIDEO_UPDATE( psx ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, 14745600) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MDRV_AT28C16_ADD( "at28c16", NULL ) MACHINE_DRIVER_END diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 5f6e98787c9..3d8b9fb01d7 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -1623,16 +1623,16 @@ static MACHINE_DRIVER_START( default ) MDRV_VIDEO_START(namcos2) MDRV_VIDEO_UPDATE(namcos2_default) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END /* adjusted machine driver start */ @@ -1641,8 +1641,8 @@ static MACHINE_DRIVER_START( default2 ) MDRV_SOUND_REPLACE("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* end */ @@ -1651,12 +1651,12 @@ static MACHINE_DRIVER_START( default3 ) MDRV_SOUND_REPLACE("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_REPLACE("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( gollygho ) @@ -1697,16 +1697,16 @@ static MACHINE_DRIVER_START( gollygho ) MDRV_VIDEO_START(namcos2) MDRV_VIDEO_UPDATE(namcos2_default) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END static MACHINE_DRIVER_START( finallap ) @@ -1747,16 +1747,16 @@ static MACHINE_DRIVER_START( finallap ) MDRV_VIDEO_START(finallap) MDRV_VIDEO_UPDATE(finallap) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END static MACHINE_DRIVER_START( sgunner ) @@ -1797,16 +1797,16 @@ static MACHINE_DRIVER_START( sgunner ) MDRV_VIDEO_START(sgunner) MDRV_VIDEO_UPDATE(sgunner) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END static MACHINE_DRIVER_START( luckywld ) @@ -1847,16 +1847,16 @@ static MACHINE_DRIVER_START( luckywld ) MDRV_VIDEO_START(luckywld) MDRV_VIDEO_UPDATE(luckywld) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END static MACHINE_DRIVER_START( metlhawk ) @@ -1897,16 +1897,16 @@ static MACHINE_DRIVER_START( metlhawk ) MDRV_VIDEO_START(metlhawk) MDRV_VIDEO_UPDATE(metlhawk) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(c140_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index 0aa7e118968..e9f2b6009fe 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -1586,31 +1586,31 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( poly_c140_typeA ) MDRV_IMPORT_FROM(s21base) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(C140_interface_typeA) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END static MACHINE_DRIVER_START( poly_c140_typeB ) MDRV_IMPORT_FROM(s21base) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(C140_interface_typeB) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END static MACHINE_DRIVER_START( driveyes ) @@ -1656,16 +1656,16 @@ static MACHINE_DRIVER_START( driveyes ) MDRV_VIDEO_START(namcos21) MDRV_VIDEO_UPDATE(namcos21) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(C140_interface_typeA) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END static MACHINE_DRIVER_START( winrun_c140_typeB ) @@ -1714,16 +1714,16 @@ static MACHINE_DRIVER_START( winrun_c140_typeB ) MDRV_VIDEO_START(namcos21) MDRV_VIDEO_UPDATE(namcos21) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c140", C140, 8000000/374) MDRV_SOUND_CONFIG(C140_interface_typeB) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2151, 3579580) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END ROM_START( aircombu ) diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 0d273ddfda2..4ae9b839655 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -2784,13 +2784,13 @@ static MACHINE_DRIVER_START( namcos22s ) MDRV_MACHINE_RESET(namcoss22) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, SS22_MASTER_CLOCK/3) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_DRIVER_END /*********************************************************************************/ @@ -3197,13 +3197,13 @@ static MACHINE_DRIVER_START( namcos22 ) MDRV_MACHINE_RESET(namcos22) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, SS22_MASTER_CLOCK/3) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_DRIVER_END /*********************************************************************************/ diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 60b24d93b20..1778091064b 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1319,13 +1319,13 @@ static MACHINE_DRIVER_START( gorgon ) MDRV_VIDEO_UPDATE(gorgon) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, 14745600) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_DRIVER_END static MACHINE_DRIVER_START( s23 ) @@ -1363,13 +1363,13 @@ static MACHINE_DRIVER_START( s23 ) MDRV_VIDEO_UPDATE(ss23) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, 14745600) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_DRIVER_END static MACHINE_DRIVER_START( ss23 ) @@ -1402,13 +1402,13 @@ static MACHINE_DRIVER_START( ss23 ) MDRV_VIDEO_UPDATE(ss23) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("c352", C352, 14745600) - MDRV_SOUND_ROUTE(0, "right", 1.00) - MDRV_SOUND_ROUTE(1, "left", 1.00) - MDRV_SOUND_ROUTE(2, "right", 1.00) - MDRV_SOUND_ROUTE(3, "left", 1.00) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "lspeaker", 1.00) MACHINE_DRIVER_END ROM_START( rapidrvr ) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index eee94fe4702..f120c3cac7a 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -892,11 +892,11 @@ static MACHINE_DRIVER_START( naomi_base ) MDRV_VIDEO_START(dc) MDRV_VIDEO_UPDATE(dc) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("aica", AICA, 0) MDRV_SOUND_CONFIG(aica_config) - MDRV_SOUND_ROUTE(0, "left", 2.0) - MDRV_SOUND_ROUTE(0, "right", 2.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 2.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 2.0) MACHINE_DRIVER_END /* diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index ff65e0f9236..f66cc4306b9 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -2229,23 +2229,23 @@ static MACHINE_DRIVER_START( salamand ) MDRV_VIDEO_UPDATE(salamand) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("vlm", VLM5030, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.10) - MDRV_SOUND_ROUTE(0, "right", 0.10) - MDRV_SOUND_ROUTE(1, "left", 0.10) - MDRV_SOUND_ROUTE(1, "right", 0.10) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2278,19 +2278,19 @@ static MACHINE_DRIVER_START( blkpnthr ) MDRV_VIDEO_UPDATE(salamand) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.10) - MDRV_SOUND_ROUTE(0, "right", 0.10) - MDRV_SOUND_ROUTE(1, "left", 0.10) - MDRV_SOUND_ROUTE(1, "right", 0.10) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2323,23 +2323,23 @@ static MACHINE_DRIVER_START( citybomb ) MDRV_VIDEO_UPDATE(salamand) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(0, "right", 0.30) - MDRV_SOUND_ROUTE(1, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MDRV_SOUND_ADD("ym", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("konami2", K051649, 3579545/2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.38) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.38) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.38) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.38) MACHINE_DRIVER_END @@ -2372,23 +2372,23 @@ static MACHINE_DRIVER_START( nyanpani ) MDRV_VIDEO_UPDATE(salamand) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(0, "right", 0.30) - MDRV_SOUND_ROUTE(1, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MDRV_SOUND_ADD("ym", YM3812, 3579545) MDRV_SOUND_CONFIG(ym3812_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("konami2", K051649, 3579545/2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.38) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.38) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.38) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.38) MACHINE_DRIVER_END @@ -2510,23 +2510,23 @@ static MACHINE_DRIVER_START( hcrash ) MDRV_VIDEO_UPDATE(salamand) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("vlm", VLM5030, 3579545) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.10) - MDRV_SOUND_ROUTE(0, "right", 0.10) - MDRV_SOUND_ROUTE(1, "left", 0.10) - MDRV_SOUND_ROUTE(1, "right", 0.10) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 6d9e416294d..69734992853 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -1252,14 +1252,14 @@ static MACHINE_DRIVER_START( neogeo ) MDRV_SCREEN_RAW_PARAMS(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART) /* audio hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, NEOGEO_YM2610_CLOCK) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(0, "right", 0.60) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END /************************************* diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 3355063b519..0fd1ef49bfb 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -627,14 +627,14 @@ static MACHINE_DRIVER_START( ninjaw ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(ninjaw_readmem,ninjaw_writemem) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 16/4 MHz ? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(ninjaw_cpub_readmem,ninjaw_cpub_writemem) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices */ @@ -646,21 +646,21 @@ static MACHINE_DRIVER_START( ninjaw ) MDRV_PALETTE_LENGTH(4096*3) MDRV_DEFAULT_LAYOUT(layout_darius) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(36*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) - MDRV_SCREEN_ADD("middle", RASTER) + MDRV_SCREEN_ADD("mscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(36*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -671,25 +671,25 @@ static MACHINE_DRIVER_START( ninjaw ) MDRV_VIDEO_UPDATE(ninjaw) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // MDRV_SOUND_ADD("subwoofer", SUBWOOFER, 0) MACHINE_DRIVER_END @@ -700,14 +700,14 @@ static MACHINE_DRIVER_START( darius2 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius2_readmem,darius2_writemem) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(z80_sound_readmem,z80_sound_writemem) MDRV_CPU_ADD("sub", M68000,16000000/2) /* 8 MHz ? */ MDRV_CPU_PROGRAM_MAP(darius2_cpub_readmem,darius2_cpub_writemem) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_QUANTUM_TIME(HZ(6000)) /* CPU slices */ @@ -719,21 +719,21 @@ static MACHINE_DRIVER_START( darius2 ) MDRV_PALETTE_LENGTH(4096*3) MDRV_DEFAULT_LAYOUT(layout_darius) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(36*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) - MDRV_SCREEN_ADD("middle", RASTER) + MDRV_SCREEN_ADD("mscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(36*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 36*8-1, 3*8, 31*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -744,25 +744,25 @@ static MACHINE_DRIVER_START( darius2 ) MDRV_VIDEO_UPDATE(ninjaw) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // MDRV_SOUND_ADD("subwoofer", SUBWOOFER, 0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 58c6af2db94..44c5421b0bf 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -4952,17 +4952,17 @@ static MACHINE_DRIVER_START( stagger1 ) MDRV_VIDEO_EOF(nmk) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_4MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(afega_ym2151_intf) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MDRV_SOUND_ADD("oki1", OKIM6295, XTAL_4MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) /* verified on pcb */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.70) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.70) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70) MACHINE_DRIVER_END static MACHINE_DRIVER_START( redhawki ) diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 0f8ecd2b523..af5df3f52b9 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -431,11 +431,11 @@ static MACHINE_DRIVER_START( snes ) MDRV_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("snes", SNES, 0) - MDRV_SOUND_ROUTE(0, "left", 1.00) - MDRV_SOUND_ROUTE(1, "right", 1.00) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 64e350ca4b2..6da8f72f412 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -1067,11 +1067,11 @@ static MACHINE_DRIVER_START( nwktr ) MDRV_VIDEO_START(nwktr) MDRV_VIDEO_UPDATE(nwktr) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("rf", RF5C400, 64000000/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_M48T58_ADD( "m48t58" ) MACHINE_DRIVER_END diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index 4372e315c10..98034baa549 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -605,22 +605,22 @@ static MACHINE_DRIVER_START( opwolf ) MDRV_VIDEO_UPDATE(opwolf) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK ) /* 4 MHz */ MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("msm1", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MDRV_SOUND_ADD("msm2", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MACHINE_DRIVER_END @@ -657,22 +657,22 @@ static MACHINE_DRIVER_START( opwolfb ) /* OSC clocks unknown for the bootleg, bu MDRV_VIDEO_UPDATE(opwolf) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CPU_CLOCK ) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("msm1", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MDRV_SOUND_ADD("msm2", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 711277263f7..924ad219ae9 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -310,12 +310,12 @@ static MACHINE_DRIVER_START( orbit ) MDRV_VIDEO_UPDATE(orbit) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(orbit) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index f94f327cf41..ca00baf4917 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -717,7 +717,7 @@ static MACHINE_DRIVER_START( othunder ) MDRV_VIDEO_UPDATE(othunder) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) @@ -729,17 +729,17 @@ static MACHINE_DRIVER_START( othunder ) MDRV_SOUND_ROUTE(2, "2610.2r", 1.0) MDRV_SOUND_ADD("2610.0l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.0r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.1r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c index b2f5af8bfd2..7b179d6dd55 100644 --- a/src/mame/drivers/overdriv.c +++ b/src/mame/drivers/overdriv.c @@ -418,21 +418,21 @@ static MACHINE_DRIVER_START( overdriv ) MDRV_VIDEO_UPDATE(overdriv) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami1", K053260, 3579545) MDRV_SOUND_CONFIG(k053260_config) - MDRV_SOUND_ROUTE(0, "left", 0.70) - MDRV_SOUND_ROUTE(1, "right", 0.70) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) MDRV_SOUND_ADD("konami2", K053260, 3579545) MDRV_SOUND_CONFIG(k053260_config) - MDRV_SOUND_ROUTE(0, "left", 0.70) - MDRV_SOUND_ROUTE(1, "right", 0.70) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) MACHINE_DRIVER_END diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c index a965d8a7d99..974e500ac3a 100644 --- a/src/mame/drivers/paranoia.c +++ b/src/mame/drivers/paranoia.c @@ -160,10 +160,10 @@ static MACHINE_DRIVER_START( paranoia ) MDRV_VIDEO_START( pce ) MDRV_VIDEO_UPDATE( pce ) - MDRV_SPEAKER_STANDARD_STEREO("left","right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") MDRV_SOUND_ADD("maincpu", C6280, PCE_MAIN_CLOCK/6) - MDRV_SOUND_ROUTE(0, "left", 1.00) - MDRV_SOUND_ROUTE(1, "right", 1.00) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_DRIVER_END diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 5e808481675..6bb8c80ddbc 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -315,15 +315,15 @@ static MACHINE_DRIVER_START( parodius ) MDRV_VIDEO_UPDATE(parodius) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K053260, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.70) - MDRV_SOUND_ROUTE(1, "right", 0.70) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index 872f93de536..47b24166848 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -362,17 +362,17 @@ static MACHINE_DRIVER_START( pktgaldx ) MDRV_VIDEO_UPDATE(pktgaldx) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index 8eece39b336..fd25c734463 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -667,17 +667,17 @@ static MACHINE_DRIVER_START( plygonet ) MDRV_VIDEO_UPDATE(polygonet) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END static INPUT_PORTS_START( polygonet ) diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 5021d59ed13..0392795ffd1 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -875,28 +875,28 @@ static MACHINE_DRIVER_START( polepos ) MDRV_VIDEO_UPDATE(polepos) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("namco", NAMCO, 24576000/512) MDRV_SOUND_CONFIG(namco_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("namco52", NAMCO_52XX, 24576000/16) /* 1.536 MHz */ MDRV_SOUND_CONFIG(namco_52xx_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) /* discrete circuit on the 54XX outputs */ MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(polepos) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90) /* engine sound */ MDRV_SOUND_ADD("polepos", POLEPOS, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.90 * 0.77) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.90 * 0.77) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.90 * 0.77) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.90 * 0.77) MACHINE_DRIVER_END diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index 616d43694ca..047e1728975 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -461,11 +461,11 @@ static MACHINE_DRIVER_START( policetr ) MDRV_VIDEO_UPDATE(policetr) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("bsmt", BSMT2000, MASTER_CLOCK/2) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c index faad4634634..25817973dbc 100644 --- a/src/mame/drivers/psattack.c +++ b/src/mame/drivers/psattack.c @@ -181,12 +181,12 @@ static MACHINE_DRIVER_START( psattack ) MDRV_PALETTE_INIT(RRRRR_GGGGGG_BBBBB) MDRV_PALETTE_LENGTH(65536) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("vrender", VRENDER0, 0) MDRV_SOUND_CONFIG(vr0_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index c38f984e884..1b3b4b4df29 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -1232,14 +1232,14 @@ static MACHINE_DRIVER_START( sngkace ) MDRV_VIDEO_UPDATE(psikyo) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(sngkace_ym2610_interface) - MDRV_SOUND_ROUTE(0, "left", 1.2) - MDRV_SOUND_ROUTE(0, "right", 1.2) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.2) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.2) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1283,14 +1283,14 @@ static MACHINE_DRIVER_START( gunbird ) MDRV_VIDEO_UPDATE(psikyo) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(gunbird_ym2610_interface) - MDRV_SOUND_ROUTE(0, "left", 1.2) - MDRV_SOUND_ROUTE(0, "right", 1.2) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.2) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.2) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1345,12 +1345,12 @@ static MACHINE_DRIVER_START( s1945 ) MDRV_VIDEO_UPDATE(psikyo) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) MDRV_SOUND_CONFIG(ymf278b_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 865bfa9cca8..0ae803c7fe7 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -443,7 +443,7 @@ static MACHINE_DRIVER_START( ps4big ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", SH2, MASTER_CLOCK/2) MDRV_CPU_PROGRAM_MAP(ps4_readmem,ps4_writemem) - MDRV_CPU_VBLANK_INT("left", psikyosh_interrupt) + MDRV_CPU_VBLANK_INT("lscreen", psikyosh_interrupt) MDRV_NVRAM_HANDLER(93C56) @@ -452,14 +452,14 @@ static MACHINE_DRIVER_START( ps4big ) MDRV_PALETTE_LENGTH((0x2000/4)*2 + 2) /* 0x2000/4 for each screen. 1 for each screen clear colour */ MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(40*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 28*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -470,22 +470,22 @@ static MACHINE_DRIVER_START( ps4big ) MDRV_VIDEO_UPDATE(psikyo4) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2) MDRV_SOUND_CONFIG(ymf278b_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( ps4small ) /* basic machine hardware */ MDRV_IMPORT_FROM(ps4big) - MDRV_SCREEN_MODIFY("left") + MDRV_SCREEN_MODIFY("lscreen") MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) - MDRV_SCREEN_MODIFY("right") + MDRV_SCREEN_MODIFY("rscreen") MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 0*8, 30*8-1) MACHINE_DRIVER_END diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 1d91a612f9a..f5a1ea6653d 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -587,12 +587,12 @@ static MACHINE_DRIVER_START( psikyo3v1 ) MDRV_VIDEO_UPDATE(psikyosh) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2) MDRV_SOUND_CONFIG(ymf278b_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( psikyo5 ) diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index 41b7cb49d37..9308d41fe1b 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -669,12 +669,12 @@ static MACHINE_DRIVER_START( qdrmfgp ) MDRV_VIDEO_UPDATE(qdrmfgp) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K054539, 18432000/384) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( qdrmfgp2 ) @@ -704,11 +704,11 @@ static MACHINE_DRIVER_START( qdrmfgp2 ) MDRV_VIDEO_UPDATE(qdrmfgp) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K054539, 18432000/384) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c index e8f94ae6629..ea5827c7635 100644 --- a/src/mame/drivers/rbmk.c +++ b/src/mame/drivers/rbmk.c @@ -502,12 +502,12 @@ static MACHINE_DRIVER_START( rbmk ) MDRV_NVRAM_HANDLER(syf) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1122000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END ROM_START( rbmk ) diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c index d48bf0f36cc..fea5f37653c 100644 --- a/src/mame/drivers/realbrk.c +++ b/src/mame/drivers/realbrk.c @@ -693,15 +693,15 @@ static MACHINE_DRIVER_START( realbrk ) MDRV_VIDEO_UPDATE(realbrk) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, XTAL_33_8688MHz / 2) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2413, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END static MACHINE_DRIVER_START( pkgnsh ) diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index f8ea5b75a8d..37ff8b7467a 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -835,22 +835,22 @@ static MACHINE_DRIVER_START( rohga ) MDRV_VIDEO_UPDATE(rohga) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.78) - MDRV_SOUND_ROUTE(1, "right", 0.78) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.78) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.78) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( wizdfire ) @@ -880,22 +880,22 @@ static MACHINE_DRIVER_START( wizdfire ) MDRV_VIDEO_UPDATE(wizdfire) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( nitrobal ) @@ -925,22 +925,22 @@ static MACHINE_DRIVER_START( nitrobal ) MDRV_VIDEO_UPDATE(nitrobal) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( schmeisr ) @@ -970,22 +970,22 @@ static MACHINE_DRIVER_START( schmeisr ) MDRV_VIDEO_UPDATE(schmeisr) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("oki1", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki2", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END /**********************************************************************************/ diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c index 135248b89a3..b0a3ac239f5 100644 --- a/src/mame/drivers/rollrace.c +++ b/src/mame/drivers/rollrace.c @@ -257,16 +257,16 @@ static MACHINE_DRIVER_START( rollrace ) MDRV_VIDEO_UPDATE(rollrace) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ay1", AY8910,XTAL_24MHz/16) /* verified on pcb */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ay2", AY8910,XTAL_24MHz/16) /* verified on pcb */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.10) MDRV_SOUND_ADD("ay3", AY8910,XTAL_24MHz/16) /* verified on pcb */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.10) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.10) MACHINE_DRIVER_END static MACHINE_DRIVER_START( rollace2 ) diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index fe2105dfb34..ea7e0fe2eea 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -355,17 +355,17 @@ static MACHINE_DRIVER_START( rng ) MDRV_VIDEO_UPDATE(rng) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static INPUT_PORTS_START( rng ) diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index e59eec299d3..3e984133e89 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -462,17 +462,17 @@ static MACHINE_DRIVER_START( sandscrp ) MDRV_VIDEO_UPDATE(sandscrp) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 12000000/6) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) MDRV_SOUND_ADD("ym", YM2203, 4000000) MDRV_SOUND_CONFIG(ym2203_intf_sandscrp) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 9fca53a7e7a..105c333f577 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -919,23 +919,23 @@ static MACHINE_DRIVER_START( sound_board_2203 ) MDRV_CPU_IO_MAP(sound_portmap_2203,0) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2203, MASTER_CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(0, "left", 0.13) - MDRV_SOUND_ROUTE(0, "right", 0.13) - MDRV_SOUND_ROUTE(1, "left", 0.13) - MDRV_SOUND_ROUTE(1, "right", 0.13) - MDRV_SOUND_ROUTE(2, "left", 0.13) - MDRV_SOUND_ROUTE(2, "right", 0.13) - MDRV_SOUND_ROUTE(3, "left", 0.37) - MDRV_SOUND_ROUTE(3, "right", 0.37) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.37) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.37) MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz) MDRV_SOUND_CONFIG(segapcm_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -947,33 +947,33 @@ static MACHINE_DRIVER_START( sound_board_2203x2 ) MDRV_CPU_IO_MAP(sound_portmap_2203x2,0) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(0, "left", 0.13) - MDRV_SOUND_ROUTE(0, "right", 0.13) - MDRV_SOUND_ROUTE(1, "left", 0.13) - MDRV_SOUND_ROUTE(1, "right", 0.13) - MDRV_SOUND_ROUTE(2, "left", 0.13) - MDRV_SOUND_ROUTE(2, "right", 0.13) - MDRV_SOUND_ROUTE(3, "left", 0.37) - MDRV_SOUND_ROUTE(3, "right", 0.37) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.37) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.37) MDRV_SOUND_ADD("ym2", YM2203, MASTER_CLOCK_8MHz/2) - MDRV_SOUND_ROUTE(0, "left", 0.13) - MDRV_SOUND_ROUTE(0, "right", 0.13) - MDRV_SOUND_ROUTE(1, "left", 0.13) - MDRV_SOUND_ROUTE(1, "right", 0.13) - MDRV_SOUND_ROUTE(2, "left", 0.13) - MDRV_SOUND_ROUTE(2, "right", 0.13) - MDRV_SOUND_ROUTE(3, "left", 0.37) - MDRV_SOUND_ROUTE(3, "right", 0.37) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.13) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.13) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.37) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.37) MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2) MDRV_SOUND_CONFIG(segapcm_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -985,17 +985,17 @@ static MACHINE_DRIVER_START( sound_board_2151 ) MDRV_CPU_IO_MAP(sound_portmap_2151,0) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, MASTER_CLOCK_8MHz/2) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.43) - MDRV_SOUND_ROUTE(1, "right", 0.43) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) MDRV_SOUND_ADD("pcm", SEGAPCM, MASTER_CLOCK_8MHz/2) MDRV_SOUND_CONFIG(segapcm_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index f42df393e3b..7d3f470169f 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -354,11 +354,11 @@ static MACHINE_DRIVER_START( astron ) MDRV_PALETTE_LENGTH(256) /* sound hardare */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 5a3b5b241ac..c6f4fa78d53 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -832,16 +832,16 @@ static MACHINE_DRIVER_START( outrundx ) MDRV_VIDEO_UPDATE(outrun) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) - MDRV_SOUND_ROUTE(0, "left", 0.43) - MDRV_SOUND_ROUTE(1, "right", 0.43) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4) MDRV_SOUND_CONFIG(segapcm_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index c2d7635e267..fc94b082527 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -1804,16 +1804,16 @@ static MACHINE_DRIVER_START( system24 ) MDRV_VIDEO_START(system24) MDRV_VIDEO_UPDATE(system24) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index b938f411c4e..c699c268f7d 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -2179,20 +2179,20 @@ static MACHINE_DRIVER_START( system32 ) MDRV_VIDEO_UPDATE(system32) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM3438, MASTER_CLOCK/4) MDRV_SOUND_CONFIG(ym3438_config) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) MDRV_SOUND_ADD("ym2", YM3438, MASTER_CLOCK/4) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) MDRV_SOUND_ADD("rf", RF5C68, RFC_CLOCK/4) - MDRV_SOUND_ROUTE(0, "left", 0.55) - MDRV_SOUND_ROUTE(1, "right", 0.55) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.55) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.55) MACHINE_DRIVER_END @@ -2210,7 +2210,7 @@ static MACHINE_DRIVER_START( multi32 ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", V70, MULTI32_CLOCK/2) MDRV_CPU_PROGRAM_MAP(multi32_map,0) - MDRV_CPU_VBLANK_INT("left", start_of_vblank_int) + MDRV_CPU_VBLANK_INT("lscreen", start_of_vblank_int) MDRV_CPU_ADD("soundcpu", Z80, MASTER_CLOCK/4) MDRV_CPU_PROGRAM_MAP(multi32_sound_map,0) @@ -2224,13 +2224,13 @@ static MACHINE_DRIVER_START( multi32 ) MDRV_PALETTE_LENGTH(0x8000) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_SIZE(52*8, 262) MDRV_SCREEN_VISIBLE_AREA(0*8, 52*8-1, 0*8, 28*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_SIZE(52*8, 262) @@ -2240,16 +2240,16 @@ static MACHINE_DRIVER_START( multi32 ) MDRV_VIDEO_UPDATE(multi32) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/4) MDRV_SOUND_CONFIG(ym3438_config) - MDRV_SOUND_ROUTE(1, "left", 0.40) - MDRV_SOUND_ROUTE(0, "right", 0.40) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.40) MDRV_SOUND_ADD("sega", MULTIPCM, MASTER_CLOCK/4) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(0, "right", 1.0) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c index c6ded4c0f89..f53b72ef097 100644 --- a/src/mame/drivers/segaxbd.c +++ b/src/mame/drivers/segaxbd.c @@ -1364,17 +1364,17 @@ static MACHINE_DRIVER_START( xboard ) MDRV_VIDEO_UPDATE(xboard) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.43) - MDRV_SOUND_ROUTE(1, "right", 0.43) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/4) MDRV_SOUND_CONFIG(segapcm_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c index 5f0b65f8fc9..eb46b596c72 100644 --- a/src/mame/drivers/segaybd.c +++ b/src/mame/drivers/segaybd.c @@ -995,17 +995,17 @@ static MACHINE_DRIVER_START( yboard ) MDRV_VIDEO_UPDATE(yboard) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, SOUND_CLOCK/8) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.43) - MDRV_SOUND_ROUTE(1, "right", 0.43) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.43) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.43) MDRV_SOUND_ADD("pcm", SEGAPCM, SOUND_CLOCK/8) MDRV_SOUND_CONFIG(segapcm_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 8a01e5f4d24..f0d968d2864 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1743,12 +1743,12 @@ static MACHINE_DRIVER_START( spi ) MDRV_VIDEO_START(spi) MDRV_VIDEO_UPDATE(spi) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF271, 16934400) MDRV_SOUND_CONFIG(ymf271_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_RESET( sxx2f ) @@ -1788,8 +1788,8 @@ static MACHINE_DRIVER_START( sxx2g ) /* single board version using measured cloc MDRV_SOUND_REPLACE("ymf", YMF271, 16384000) /* 16.3840MHz */ MDRV_SOUND_CONFIG(ymf271_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_MACHINE_RESET(sxx2f) MDRV_NVRAM_HANDLER(sxx2f) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 3916e40544d..86c91afd4e7 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -6786,16 +6786,16 @@ static MACHINE_DRIVER_START( tndrcade ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, 16000000/4) /* 4 MHz */ MDRV_SOUND_CONFIG(tndrcade_ym2203_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MDRV_SOUND_ADD("ym2", YM3812, 16000000/4) /* 4 MHz */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -6836,12 +6836,12 @@ static MACHINE_DRIVER_START( twineagl ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -6878,12 +6878,12 @@ static MACHINE_DRIVER_START( downtown ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -6941,12 +6941,12 @@ static MACHINE_DRIVER_START( usclssic ) MDRV_VIDEO_UPDATE(usclssic) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf2) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -6988,12 +6988,12 @@ static MACHINE_DRIVER_START( calibr50 ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf2) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7029,12 +7029,12 @@ static MACHINE_DRIVER_START( metafox ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7068,12 +7068,12 @@ static MACHINE_DRIVER_START( atehate ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7112,12 +7112,12 @@ static MACHINE_DRIVER_START( blandia ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( blandiap ) @@ -7144,12 +7144,12 @@ static MACHINE_DRIVER_START( blandiap ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7179,12 +7179,12 @@ static MACHINE_DRIVER_START( blockcar ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7214,12 +7214,12 @@ static MACHINE_DRIVER_START( daioh ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -7255,12 +7255,12 @@ static MACHINE_DRIVER_START( drgnunit ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* Same as qzkklogy, but with a 16MHz CPU and different @@ -7289,12 +7289,12 @@ static MACHINE_DRIVER_START( qzkklgy2 ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7324,12 +7324,12 @@ static MACHINE_DRIVER_START( eightfrc ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7365,12 +7365,12 @@ static MACHINE_DRIVER_START( extdwnhl ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7426,12 +7426,12 @@ static MACHINE_DRIVER_START( gundhara ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7466,12 +7466,12 @@ static MACHINE_DRIVER_START( jjsquawk ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( jjsquawb ) @@ -7497,12 +7497,12 @@ static MACHINE_DRIVER_START( jjsquawb ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -7536,12 +7536,12 @@ static MACHINE_DRIVER_START( kamenrid ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -7572,12 +7572,12 @@ static MACHINE_DRIVER_START( orbs ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 14318180) /* 14.318180 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7607,12 +7607,12 @@ static MACHINE_DRIVER_START( krzybowl ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7649,12 +7649,12 @@ static MACHINE_DRIVER_START( madshark ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -7694,12 +7694,12 @@ static MACHINE_DRIVER_START( msgundam ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7730,12 +7730,12 @@ static MACHINE_DRIVER_START( oisipuzl ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -7766,12 +7766,12 @@ static MACHINE_DRIVER_START( triplfun ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 792000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -7801,12 +7801,12 @@ static MACHINE_DRIVER_START( kiwame ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7839,12 +7839,12 @@ static MACHINE_DRIVER_START( rezon ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7877,12 +7877,12 @@ static MACHINE_DRIVER_START( thunderl ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7941,12 +7941,12 @@ static MACHINE_DRIVER_START( wits ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -7977,12 +7977,12 @@ static MACHINE_DRIVER_START( umanclub ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -8016,17 +8016,17 @@ static MACHINE_DRIVER_START( utoukond ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("ym", YM3438, 16000000/4) /* 4 MHz */ MDRV_SOUND_CONFIG(utoukond_ym3438_intf) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END @@ -8064,12 +8064,12 @@ static MACHINE_DRIVER_START( wrofaero ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -8107,12 +8107,12 @@ static MACHINE_DRIVER_START( zingzip ) MDRV_VIDEO_UPDATE(seta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** @@ -8141,12 +8141,12 @@ static MACHINE_DRIVER_START( pairlove ) MDRV_VIDEO_UPDATE(seta_no_layers) /* just draw the sprites */ /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) /* 16 MHz */ MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -8245,12 +8245,12 @@ static MACHINE_DRIVER_START( inttoote ) MDRV_VIDEO_UPDATE(inttoote) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 16000000) MDRV_SOUND_CONFIG(seta_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) /* devices */ MDRV_MSM6242_ADD("rtc") diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 14a64d34abd..176c216e640 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -2320,12 +2320,12 @@ static MACHINE_DRIVER_START( mj4simai ) MDRV_VIDEO_EOF(seta2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("x1", X1_010, 50000000/3) MDRV_SOUND_CONFIG(x1_010_sound_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( gundamex ) diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 00c0a839757..24f8ae780fd 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -840,22 +840,22 @@ static MACHINE_DRIVER_START( sf ) MDRV_VIDEO_UPDATE(sf) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("msm1", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("msm2", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index f8e214d768b..abfb71012d2 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -531,17 +531,17 @@ static MACHINE_DRIVER_START( shadfrce ) MDRV_VIDEO_UPDATE(shadfrce) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_13_4952MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) /* verified on pcb, pin7 is at 2.4v */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END /* Rom Defs. */ diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c index e023eb72358..2b370a85089 100644 --- a/src/mame/drivers/shisen.c +++ b/src/mame/drivers/shisen.c @@ -257,16 +257,16 @@ static MACHINE_DRIVER_START( shisen ) MDRV_VIDEO_UPDATE(sichuan2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index ca1b7600cb9..bf6cf08d44d 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -307,21 +307,21 @@ static MACHINE_DRIVER_START( silkroad ) MDRV_VIDEO_UPDATE(silkroad) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("oki1", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.45) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.45) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45) MDRV_SOUND_ADD("oki2", OKIM6295, 2112000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.45) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.45) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.45) MACHINE_DRIVER_END diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index cec1efc122b..b872ecd1ac8 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -478,18 +478,18 @@ static MACHINE_DRIVER_START( chainrec ) MDRV_VIDEO_START(simpl156) MDRV_VIDEO_UPDATE(simpl156) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("okisfx", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.6) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.6) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6) MDRV_SOUND_ADD("okimusic", OKIM6295, 32220000/16) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.2) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) MACHINE_DRIVER_END static MACHINE_DRIVER_START( magdrop ) @@ -521,8 +521,8 @@ static MACHINE_DRIVER_START( mitchell156 ) MDRV_SOUND_REPLACE("okimusic", OKIM6295, 32220000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.2) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.2) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.2) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.2) MACHINE_DRIVER_END diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c index c60f71939ad..01d7fb7ca15 100644 --- a/src/mame/drivers/simpsons.c +++ b/src/mame/drivers/simpsons.c @@ -341,17 +341,17 @@ static MACHINE_DRIVER_START( simpsons ) MDRV_VIDEO_UPDATE(simpsons) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) /* verified on pcb */ - MDRV_SOUND_ROUTE(0, "left", 1.0) /* only left channel is connected */ - MDRV_SOUND_ROUTE(0, "right", 1.0) - MDRV_SOUND_ROUTE(1, "left", 0.0) - MDRV_SOUND_ROUTE(1, "right", 0.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) /* only left channel is connected */ + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.0) MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) /* verified on pcb */ - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index d172da2b603..c326e33c445 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -551,14 +551,14 @@ static MACHINE_DRIVER_START( slapshot ) MDRV_VIDEO_UPDATE(slapshot) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610B, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MDRV_MK48T08_ADD( "mk48t08" ) MACHINE_DRIVER_END @@ -591,14 +591,14 @@ static MACHINE_DRIVER_START( opwolf3 ) MDRV_VIDEO_UPDATE(slapshot) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610B, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MDRV_MK48T08_ADD( "mk48t08" ) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index 7560f0b7ded..d7e3682c912 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -552,12 +552,12 @@ static MACHINE_DRIVER_START( sliver ) MDRV_VIDEO_START(sliver) MDRV_VIDEO_UPDATE(sliver) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.6) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.6) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.6) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.6) MACHINE_DRIVER_END ROM_START( sliver ) diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c index 5d81adb97f4..0a7576e043e 100644 --- a/src/mame/drivers/snesb.c +++ b/src/mame/drivers/snesb.c @@ -564,11 +564,11 @@ static MACHINE_DRIVER_START( kinstb ) MDRV_SCREEN_RAW_PARAMS(DOTCLK_NTSC, SNES_HTOTAL, 0, SNES_SCR_WIDTH, SNES_VTOTAL_NTSC, 0, SNES_SCR_HEIGHT_NTSC) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("snes", SNES, 0) - MDRV_SOUND_ROUTE(0, "left", 1.00) - MDRV_SOUND_ROUTE(1, "right", 1.00) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_DRIVER_END static DRIVER_INIT(kinstb) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index d74926976b2..8608594952b 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -472,22 +472,22 @@ static MACHINE_DRIVER_START( spdodgeb ) MDRV_MACHINE_RESET( spdodgeb ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, 3000000) MDRV_SOUND_CONFIG(ym3812_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("msm1", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("msm2", MSM5205, 384000) MDRV_SOUND_CONFIG(msm5205_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c index a176edd93c3..56cc9e7a1d1 100644 --- a/src/mame/drivers/speglsht.c +++ b/src/mame/drivers/speglsht.c @@ -348,12 +348,12 @@ static MACHINE_DRIVER_START( speglsht ) MDRV_VIDEO_START(st0016) MDRV_VIDEO_UPDATE(st0016) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("st", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END ROM_START( speglsht ) diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index ba179a5e95f..31ea97e23ff 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -285,12 +285,12 @@ static MACHINE_DRIVER_START( spool99 ) MDRV_VIDEO_START(spool99) MDRV_VIDEO_UPDATE(spool99) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index ba2b4365d61..f670a7911d7 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -524,12 +524,12 @@ static MACHINE_DRIVER_START( sprint2 ) MDRV_VIDEO_EOF(sprint2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(sprint2) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -538,8 +538,8 @@ static MACHINE_DRIVER_START( sprint1 ) MDRV_IMPORT_FROM(sprint2) /* sound hardware */ - MDRV_SPEAKER_REMOVE("left") - MDRV_SPEAKER_REMOVE("right") + MDRV_SPEAKER_REMOVE("lspeaker") + MDRV_SPEAKER_REMOVE("rspeaker") MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_REMOVE("discrete") @@ -555,8 +555,8 @@ static MACHINE_DRIVER_START( dominos ) MDRV_IMPORT_FROM(sprint2) /* sound hardware */ - MDRV_SPEAKER_REMOVE("left") - MDRV_SPEAKER_REMOVE("right") + MDRV_SPEAKER_REMOVE("lspeaker") + MDRV_SPEAKER_REMOVE("rspeaker") MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_REMOVE("discrete") diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c index 0c1215507a1..e0fbf9a7e42 100644 --- a/src/mame/drivers/sprint4.c +++ b/src/mame/drivers/sprint4.c @@ -424,12 +424,12 @@ static MACHINE_DRIVER_START( sprint4 ) MDRV_VIDEO_EOF(sprint4) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(sprint4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 3eb18d71103..37504653476 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -540,12 +540,12 @@ static MACHINE_DRIVER_START( srmp5 ) MDRV_VIDEO_START(st0016) MDRV_VIDEO_UPDATE(srmp5) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("st", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END ROM_START( srmp5 ) diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 33ec3855ac8..b7c147f1353 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -662,11 +662,11 @@ static MACHINE_DRIVER_START( srmp6 ) MDRV_VIDEO_UPDATE(srmp6) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("nile", NILE, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index 8527c1c644b..99a872b7240 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -367,17 +367,17 @@ static MACHINE_DRIVER_START( sshangha ) MDRV_VIDEO_UPDATE(sshangha) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2203, 16000000/4) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) MDRV_SOUND_ADD("oki", OKIM6295, 1023924) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.27) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.27) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.27) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.27) MACHINE_DRIVER_END /******************************************************************************/ diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 3ef2f85a06d..e62c585e84f 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -2818,12 +2818,12 @@ static MACHINE_DRIVER_START( ssv ) MDRV_VIDEO_UPDATE(ssv) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ensoniq", ES5506, 16000000) MDRV_SOUND_CONFIG(es5506_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index f186676fb97..c0878658236 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -455,12 +455,12 @@ static MACHINE_DRIVER_START( st0016 ) MDRV_VIDEO_START(st0016) MDRV_VIDEO_UPDATE(st0016) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("st", ST0016, 0) MDRV_SOUND_CONFIG(st0016_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( mayjinsn ) diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c index 9a86c361a55..146d83522ac 100644 --- a/src/mame/drivers/stepstag.c +++ b/src/mame/drivers/stepstag.c @@ -131,7 +131,7 @@ static MACHINE_DRIVER_START( stepstag ) MDRV_CPU_PROGRAM_MAP(stepstag_sub_readmem,stepstag_sub_writemem) /* video hardware */ - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) @@ -145,7 +145,7 @@ static MACHINE_DRIVER_START( stepstag ) MDRV_SCREEN_SIZE(64*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 32*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 190ae8c461d..524c4a6348a 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -2730,12 +2730,12 @@ static MACHINE_DRIVER_START( stv ) MDRV_VIDEO_START(stv_vdp2) MDRV_VIDEO_UPDATE(stv_vdp2) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("scsp", SCSP, 0) MDRV_SOUND_CONFIG(scsp_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END #define ROM_LOAD16_WORD_SWAP_BIOS(bios,name,offset,length,hash) \ diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c index 14ceab23f54..6e96c26dd16 100644 --- a/src/mame/drivers/subs.c +++ b/src/mame/drivers/subs.c @@ -196,14 +196,14 @@ static MACHINE_DRIVER_START( subs ) MDRV_PALETTE_LENGTH(4) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(57) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MDRV_SCREEN_SIZE(32*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(57) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) @@ -218,12 +218,12 @@ static MACHINE_DRIVER_START( subs ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(subs) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 4c7937e2690..5ee05c42e4d 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -867,23 +867,23 @@ static MACHINE_DRIVER_START( bssoccer ) MDRV_VIDEO_UPDATE(suna16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MDRV_SOUND_ADD("dac3", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ADD("dac4", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END @@ -927,17 +927,17 @@ static MACHINE_DRIVER_START( uballoon ) MDRV_VIDEO_UPDATE(suna16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END /*************************************************************************** @@ -976,17 +976,17 @@ static MACHINE_DRIVER_START( sunaq ) MDRV_VIDEO_UPDATE(suna16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 14318000/4) - MDRV_SOUND_ROUTE(0, "left", 0.50) - MDRV_SOUND_ROUTE(1, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.50) MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END /*************************************************************************** @@ -1048,29 +1048,29 @@ static MACHINE_DRIVER_START( bestbest ) MDRV_VIDEO_UPDATE(bestbest) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ay", AY8910, 24000000/16) MDRV_SOUND_CONFIG(bestbest_ay8910_interface) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("ym", YM3526, 24000000/8) MDRV_SOUND_CONFIG(bestbest_ym3526_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MDRV_SOUND_ADD("dac3", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ADD("dac4", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index b955c369cc2..556ac5c353e 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -1505,21 +1505,21 @@ static MACHINE_DRIVER_START( hardhead ) MDRV_VIDEO_UPDATE(suna8) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) MDRV_SOUND_CONFIG(hardhead_ay8910_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("samples", SAMPLES, 0) MDRV_SOUND_CONFIG(suna8_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END @@ -1558,15 +1558,15 @@ static MACHINE_DRIVER_START( rranger ) MDRV_VIDEO_UPDATE(suna8) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, SUNA8_MASTER_CLOCK / 6) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym2", YM2203, SUNA8_MASTER_CLOCK / 6) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END @@ -1617,28 +1617,28 @@ static MACHINE_DRIVER_START( brickzn ) MDRV_VIDEO_UPDATE(suna8) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 6) MDRV_SOUND_CONFIG(brickzn_ym3812_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.33) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33) MDRV_SOUND_ADD("dac1", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.17) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.17) MDRV_SOUND_ADD("dac2", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.17) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.17) MDRV_SOUND_ADD("dac3", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.17) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.17) MDRV_SOUND_ADD("dac4", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.17) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.17) MACHINE_DRIVER_END @@ -1717,21 +1717,21 @@ static MACHINE_DRIVER_START( starfigh ) MDRV_VIDEO_UPDATE(suna8) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 6) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) MDRV_SOUND_CONFIG(starfigh_ay8910_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("samples", SAMPLES, 0) MDRV_SOUND_CONFIG(suna8_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END @@ -1775,21 +1775,21 @@ static MACHINE_DRIVER_START( sparkman ) MDRV_VIDEO_UPDATE(suna8) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, SUNA8_MASTER_CLOCK / 6) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("ay", AY8910, SUNA8_MASTER_CLOCK / 16) MDRV_SOUND_CONFIG(hardhead_ay8910_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.30) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) MDRV_SOUND_ADD("samples", SAMPLES, 0) MDRV_SOUND_CONFIG(suna8_samples_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 03da46b6f36..71f79b55dfb 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -320,14 +320,14 @@ static MACHINE_DRIVER_START( superdq ) MDRV_VIDEO_START(superdq) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.8) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.8) MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index 2c71723edfa..e1c02b501b5 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -877,12 +877,12 @@ static MACHINE_DRIVER_START(skns) MDRV_VIDEO_UPDATE(skns) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 33333333 / 2) MDRV_SOUND_CONFIG(ymz280b_intf) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /***** BIOS SKIPPING *****/ diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index baf32ba6c1c..e6522977ea4 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -339,14 +339,14 @@ static MACHINE_DRIVER_START( suprslam ) MDRV_VIDEO_START(suprslam) MDRV_VIDEO_UPDATE(suprslam) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END /*** ROM LOADING *************************************************************/ diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index 21906408bc0..a21afe85b8d 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -257,12 +257,12 @@ static MACHINE_DRIVER_START( surpratk ) MDRV_VIDEO_UPDATE(surpratk) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 73eb319d9fc..862278053ab 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -447,11 +447,11 @@ static MACHINE_DRIVER_START( system16 ) MDRV_VIDEO_UPDATE(system16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) - MDRV_SOUND_ROUTE(0, "left", 0.32) - MDRV_SOUND_ROUTE(1, "right", 0.32) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.32) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.32) MACHINE_DRIVER_END @@ -467,8 +467,8 @@ static MACHINE_DRIVER_START( system16_7759 ) /* sound hardware */ MDRV_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK) MDRV_SOUND_CONFIG(sys16_upd7759_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.48) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.48) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.48) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.48) MACHINE_DRIVER_END /***************************************************************************/ @@ -2045,8 +2045,8 @@ static MACHINE_DRIVER_START( tturfbl ) MDRV_SOUND_REMOVE("7759") MDRV_SOUND_ADD("5205", MSM5205, 220000) MDRV_SOUND_CONFIG(tturfbl_msm5205_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MDRV_MACHINE_RESET(tturfbl) MACHINE_DRIVER_END diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c index de5b23897e1..55847b01312 100644 --- a/src/mame/drivers/system18.c +++ b/src/mame/drivers/system18.c @@ -1087,23 +1087,23 @@ static MACHINE_DRIVER_START( system18 ) MDRV_VIDEO_UPDATE(system18old) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("3438.0", YM3438, 8000000) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) - MDRV_SOUND_ROUTE(2, "left", 0.40) - MDRV_SOUND_ROUTE(3, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.40) MDRV_SOUND_ADD("3438.1", YM3438, 8000000) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) - MDRV_SOUND_ROUTE(2, "left", 0.40) - MDRV_SOUND_ROUTE(3, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.40) MDRV_SOUND_ADD("5c68", RF5C68, 8000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1143,8 +1143,8 @@ static MACHINE_DRIVER_START( shdancbl ) MDRV_SOUND_ADD("5205", MSM5205, 200000) MDRV_SOUND_CONFIG(shdancbl_msm5205_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MDRV_MACHINE_RESET(shdancbl) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index 84d9f55d0e8..fb5e8567d7a 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -261,14 +261,14 @@ static MACHINE_DRIVER_START( tail2nos ) MDRV_VIDEO_UPDATE(tail2nos) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2608, XTAL_8MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2608_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index c57acf8a505..e4c5530e828 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -3732,14 +3732,14 @@ static MACHINE_DRIVER_START( taito_f2 ) MDRV_VIDEO_UPDATE(taitof2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 24000000/3) /* Was 16000000/2, but only a 24Mhz OSC */ MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -4224,12 +4224,12 @@ static MACHINE_DRIVER_START( driveout ) MDRV_VIDEO_UPDATE(taitof2_pri_roz) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") /* does it ? */ + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") /* does it ? */ MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 9d7af6d40ba..8923aa9f7d2 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -1013,14 +1013,14 @@ static MACHINE_DRIVER_START( superman ) MDRV_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( daisenpu ) @@ -1052,12 +1052,12 @@ static MACHINE_DRIVER_START( daisenpu ) MDRV_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MACHINE_DRIVER_END static MACHINE_DRIVER_START( gigandes ) @@ -1089,14 +1089,14 @@ static MACHINE_DRIVER_START( gigandes ) MDRV_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( ballbros ) @@ -1128,14 +1128,14 @@ static MACHINE_DRIVER_START( ballbros ) MDRV_VIDEO_UPDATE(seta_no_layers) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index 8291bea996a..d712072679a 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -3262,25 +3262,25 @@ static MACHINE_DRIVER_START( enforce ) MDRV_VIDEO_UPDATE(contcirc) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 20.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 20.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 20.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 20.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) // MDRV_SOUND_ADD("subwoofer", SUBWOOFER, 0) MACHINE_DRIVER_END @@ -3316,25 +3316,25 @@ static MACHINE_DRIVER_START( bshark ) MDRV_VIDEO_UPDATE(bshark) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_interfaceb) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 28.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 28.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 28.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 28.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END @@ -3371,25 +3371,25 @@ static MACHINE_DRIVER_START( sci ) MDRV_VIDEO_UPDATE(sci) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END @@ -3482,25 +3482,25 @@ static MACHINE_DRIVER_START( aquajack ) MDRV_VIDEO_UPDATE(aquajack) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 2.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 2.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 2.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 2.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END @@ -3534,25 +3534,25 @@ static MACHINE_DRIVER_START( spacegun ) MDRV_VIDEO_UPDATE(spacegun) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_interfaceb) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 8.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 8.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END @@ -3589,25 +3589,25 @@ static MACHINE_DRIVER_START( dblaxle ) MDRV_VIDEO_UPDATE(dblaxle) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 8.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 8.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END @@ -3643,25 +3643,25 @@ static MACHINE_DRIVER_START( racingb ) MDRV_VIDEO_UPDATE(dblaxle) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 8.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 8.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 8.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 8.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index 4e3b813c69a..df56418ac79 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -342,14 +342,14 @@ static MACHINE_DRIVER_START( taotaido ) MDRV_VIDEO_EOF( taotaido ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 8000000) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index f345c256282..cd4d1586ced 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -888,17 +888,17 @@ static MACHINE_DRIVER_START( apache3 ) MDRV_VIDEO_UPDATE(apache3) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, CLOCK_1 / 4 / 2) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_DRIVER_END static MACHINE_DRIVER_START( roundup5 ) @@ -931,17 +931,17 @@ static MACHINE_DRIVER_START( roundup5 ) MDRV_VIDEO_UPDATE(roundup5) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, CLOCK_1 / 4 / 2) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_DRIVER_END static MACHINE_DRIVER_START( cyclwarr ) @@ -975,17 +975,17 @@ static MACHINE_DRIVER_START( cyclwarr ) MDRV_VIDEO_UPDATE(cyclwarr) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, CLOCK_1 / 8) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_DRIVER_END static MACHINE_DRIVER_START( bigfight ) @@ -1019,17 +1019,17 @@ static MACHINE_DRIVER_START( bigfight ) MDRV_VIDEO_UPDATE(bigfight) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, CLOCK_1 / 4) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, CLOCK_1 / 8 / 2) /* 2MHz was too fast. Can the clock be software controlled? */ MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MACHINE_DRIVER_END /***************************************************************************/ diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index a8e3af0d8ef..3d97f838189 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -482,12 +482,12 @@ static MACHINE_DRIVER_START( tbowl ) /* CPU on Board '6206B' */ MDRV_CPU_ADD("maincpu", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ MDRV_CPU_PROGRAM_MAP(6206B_map,0) - MDRV_CPU_VBLANK_INT("left", irq0_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq0_line_hold) /* CPU on Board '6206C' */ MDRV_CPU_ADD("sub", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */ MDRV_CPU_PROGRAM_MAP(6206C_map,0) - MDRV_CPU_VBLANK_INT("left", irq0_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq0_line_hold) /* CPU on Board '6206A' */ MDRV_CPU_ADD("audiocpu", Z80, 4000000) /* Actual Z80 */ @@ -500,14 +500,14 @@ static MACHINE_DRIVER_START( tbowl ) MDRV_PALETTE_LENGTH(1024*2) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(32*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c index 6c33db244f3..9a1b8e7c396 100644 --- a/src/mame/drivers/tceptor.c +++ b/src/mame/drivers/tceptor.c @@ -439,20 +439,20 @@ static MACHINE_DRIVER_START( tceptor ) MDRV_VIDEO_EOF(tceptor) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 14318180/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("namco", NAMCO_CUS30, 49152000/2048) MDRV_SOUND_CONFIG(namco_config) - MDRV_SOUND_ROUTE(0, "left", 0.40) - MDRV_SOUND_ROUTE(1, "right", 0.40) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.40) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c index c1ed4d7386d..59a915c1522 100644 --- a/src/mame/drivers/tecmo16.c +++ b/src/mame/drivers/tecmo16.c @@ -463,17 +463,17 @@ static MACHINE_DRIVER_START( fstarfrc ) MDRV_VIDEO_UPDATE(tecmo16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 8000000/2) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("oki", OKIM6295, 999900) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( ginkun ) @@ -503,17 +503,17 @@ static MACHINE_DRIVER_START( ginkun ) MDRV_VIDEO_UPDATE(tecmo16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 8000000/2) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("oki", OKIM6295, 999900) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MACHINE_DRIVER_END static MACHINE_DRIVER_START( riot ) diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index 3c7e0498202..571bd4c4b94 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -927,23 +927,23 @@ static MACHINE_DRIVER_START( deroon ) MDRV_VIDEO_UPDATE(deroon) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymf", YMF262, 14318180) MDRV_SOUND_CONFIG(tecmosys_ymf262_interface) - MDRV_SOUND_ROUTE(0, "left", 1.00) - MDRV_SOUND_ROUTE(1, "right", 1.00) - MDRV_SOUND_ROUTE(2, "left", 1.00) - MDRV_SOUND_ROUTE(3, "right", 1.00) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.00) + MDRV_SOUND_ROUTE(2, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(3, "rspeaker", 1.00) MDRV_SOUND_ADD("oki", OKIM6295, 16000000/8) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ymz", YMZ280B, 16900000) - MDRV_SOUND_ROUTE(0, "left", 0.30) - MDRV_SOUND_ROUTE(1, "right", 0.30) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.30) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.30) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index 23e7294a938..dfe5b358def 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -1208,11 +1208,11 @@ static MACHINE_DRIVER_START( tetrisp2 ) MDRV_VIDEO_UPDATE(tetrisp2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1272,11 +1272,11 @@ static MACHINE_DRIVER_START( rockn ) MDRV_VIDEO_UPDATE(rockntread) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1304,11 +1304,11 @@ static MACHINE_DRIVER_START( rockn2 ) MDRV_VIDEO_UPDATE(rockntread) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -1317,11 +1317,11 @@ static MACHINE_DRIVER_START( rocknms ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rocknms_main_readmem,rocknms_main_writemem) - MDRV_CPU_VBLANK_INT("left", irq2_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq2_line_hold) MDRV_CPU_ADD("sub", M68000, 12000000) MDRV_CPU_PROGRAM_MAP(rocknms_sub_readmem,rocknms_sub_writemem) - MDRV_CPU_VBLANK_INT("left", irq2_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq2_line_hold) MDRV_NVRAM_HANDLER(tetrisp2) @@ -1331,14 +1331,14 @@ static MACHINE_DRIVER_START( rocknms ) MDRV_PALETTE_LENGTH(0x10000) MDRV_DEFAULT_LAYOUT(layout_rocknms) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(0x140, 0xe0) MDRV_SCREEN_VISIBLE_AREA(0, 0x140-1, 0, 0xe0-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -1350,11 +1350,11 @@ static MACHINE_DRIVER_START( rocknms ) MDRV_VIDEO_UPDATE(rocknms) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c index 1ab2a5df0b1..592993e7c95 100644 --- a/src/mame/drivers/thayers.c +++ b/src/mame/drivers/thayers.c @@ -776,12 +776,12 @@ static MACHINE_DRIVER_START( thayers ) MDRV_PALETTE_LENGTH(256) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") // SSI 263 @ 2MHz MDRV_SOUND_ADD("ldsound", LASERDISC, 0) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* ROMs */ diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index c1540bd4970..6662de7fa2e 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -2445,15 +2445,15 @@ static MACHINE_DRIVER_START( lgtnfght ) MDRV_VIDEO_UPDATE(lgtnfght) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 0.70) - MDRV_SOUND_ROUTE(1, "right", 0.70) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) MACHINE_DRIVER_END @@ -2487,15 +2487,15 @@ static MACHINE_DRIVER_START( blswhstl ) MDRV_VIDEO_EOF( blswhstl ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 0.70) - MDRV_SOUND_ROUTE(1, "right", 0.70) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "right", 0.50) /* fixed inverted stereo channels */ - MDRV_SOUND_ROUTE(1, "left", 0.50) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.50) /* fixed inverted stereo channels */ + MDRV_SOUND_ROUTE(1, "lspeaker", 0.50) MACHINE_DRIVER_END @@ -2544,11 +2544,11 @@ static MACHINE_DRIVER_START( glfgreat ) MDRV_VIDEO_UPDATE(glfgreat) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2594,12 +2594,12 @@ static MACHINE_DRIVER_START( prmrsocr ) MDRV_VIDEO_UPDATE(glfgreat) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2636,15 +2636,15 @@ static MACHINE_DRIVER_START( tmnt2 ) MDRV_VIDEO_UPDATE(tmnt2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END @@ -2677,15 +2677,15 @@ static MACHINE_DRIVER_START( ssriders ) MDRV_VIDEO_UPDATE(tmnt2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 0.70) - MDRV_SOUND_ROUTE(1, "right", 0.70) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) MACHINE_DRIVER_END @@ -2714,12 +2714,12 @@ static MACHINE_DRIVER_START( sunsetbl ) MDRV_VIDEO_UPDATE(tmnt2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( thndrx2 ) @@ -2751,15 +2751,15 @@ static MACHINE_DRIVER_START( thndrx2 ) MDRV_VIDEO_UPDATE(thndrx2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K053260, XTAL_3_579545MHz) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index f7c37ab4954..0e271913be6 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -406,20 +406,20 @@ static MACHINE_DRIVER_START(tomcat) MDRV_VIDEO_START(avg_tomcat) MDRV_VIDEO_UPDATE(vector) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("pokey1", POKEY, XTAL_14_31818MHz / 8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20) MDRV_SOUND_ADD("pokey2", POKEY, XTAL_14_31818MHz / 8) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) MDRV_SOUND_ADD("tms", TMS5220, 325000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MDRV_SOUND_ADD("ym", YM2151, XTAL_14_31818MHz / 4) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MACHINE_DRIVER_END GAME( 1985, tomcat, 0, tomcat, tomcat, 0, ROT0, "Atari", "TomCat (prototype)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 2f1a40620a1..8b2e6cb307d 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -2105,16 +2105,16 @@ static MACHINE_DRIVER_START( fncywld ) MDRV_VIDEO_UPDATE(fncywld) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MDRV_SOUND_ADD("oki", OKIM6295, 1023924) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2168,17 +2168,17 @@ static MACHINE_DRIVER_START( htchctch ) MDRV_VIDEO_UPDATE(semicom) /* sound hardware - same as hyperpac */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3427190) MDRV_SOUND_CONFIG(semicom_ym2151_interface) - MDRV_SOUND_ROUTE(0, "left", 0.10) - MDRV_SOUND_ROUTE(1, "right", 0.10) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) MDRV_SOUND_ADD("oki", OKIM6295, 1024000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( cookbib ) @@ -2192,8 +2192,8 @@ static MACHINE_DRIVER_START( bcstory ) MDRV_SOUND_REPLACE("ym", YM2151, 3427190) MDRV_SOUND_CONFIG(semicom_ym2151_interface) - MDRV_SOUND_ROUTE(0, "left", 0.10) - MDRV_SOUND_ROUTE(1, "right", 0.10) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) MACHINE_DRIVER_END static MACHINE_DRIVER_START( semibase ) @@ -2213,8 +2213,8 @@ static MACHINE_DRIVER_START( metlsavr ) MDRV_SOUND_REPLACE("ym", YM2151, 3427190) MDRV_SOUND_CONFIG(semicom_ym2151_interface) - MDRV_SOUND_ROUTE(0, "left", 0.10) - MDRV_SOUND_ROUTE(1, "right", 0.10) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.10) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.10) MACHINE_DRIVER_END static MACHINE_DRIVER_START( jumppop ) @@ -2242,16 +2242,16 @@ static MACHINE_DRIVER_START( jumppop ) MDRV_VIDEO_START(jumppop) MDRV_VIDEO_UPDATE(jumppop) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, 3500000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.70) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.70) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.70) MDRV_SOUND_ADD("oki", OKIM6295, 875000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END static MACHINE_DRIVER_START( suprtrio ) @@ -2279,12 +2279,12 @@ static MACHINE_DRIVER_START( suprtrio ) MDRV_VIDEO_UPDATE(suprtrio) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 875000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END static MACHINE_DRIVER_START( pangpang ) diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 27a933de706..78c160eeb2a 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -309,17 +309,17 @@ static MACHINE_DRIVER_START( tumblep ) MDRV_VIDEO_UPDATE(tumblep) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 32220000/9) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, 1023924) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END /******************************************************************************/ diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index 04c8f195ba9..0858d23436d 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -934,22 +934,22 @@ static MACHINE_DRIVER_START( twin16 ) MDRV_VIDEO_EOF(twin16) // sound hardware - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 7159160/2) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.20) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) MACHINE_DRIVER_END static MACHINE_DRIVER_START( devilw ) @@ -986,22 +986,22 @@ static MACHINE_DRIVER_START( fround ) MDRV_VIDEO_EOF(twin16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 7159160/2) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K007232, 3579545) MDRV_SOUND_CONFIG(k007232_config) - MDRV_SOUND_ROUTE(0, "left", 0.20) - MDRV_SOUND_ROUTE(0, "right", 0.20) - MDRV_SOUND_ROUTE(1, "left", 0.20) - MDRV_SOUND_ROUTE(1, "right", 0.20) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.20) MDRV_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.20) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) MACHINE_DRIVER_END static MACHINE_DRIVER_START( hpuncher ) diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c index ea2b4cd415d..7e8d06e84b8 100644 --- a/src/mame/drivers/tx1.c +++ b/src/mame/drivers/tx1.c @@ -722,15 +722,15 @@ static MACHINE_DRIVER_START( tx1 ) MDRV_DEFAULT_LAYOUT(layout_triphsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART) - MDRV_SCREEN_ADD("center", RASTER) + MDRV_SCREEN_ADD("cscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART) @@ -772,15 +772,15 @@ static MACHINE_DRIVER_START( buggyboy ) MDRV_DEFAULT_LAYOUT(layout_triphsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) - MDRV_SCREEN_ADD("center", RASTER) + MDRV_SCREEN_ADD("cscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c index 2173576fc32..38af045a8d4 100644 --- a/src/mame/drivers/uapce.c +++ b/src/mame/drivers/uapce.c @@ -205,10 +205,10 @@ static MACHINE_DRIVER_START( uapce ) MDRV_VIDEO_START( pce ) MDRV_VIDEO_UPDATE( pce ) - MDRV_SPEAKER_STANDARD_STEREO("left","right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker","rspeaker") MDRV_SOUND_ADD("maincpu", C6280, PCE_MAIN_CLOCK/6) - MDRV_SOUND_ROUTE(0, "left", 1.00) - MDRV_SOUND_ROUTE(1, "right", 1.00) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.00) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.00) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c index c862e6cc9a6..9324e9bb22f 100644 --- a/src/mame/drivers/ultraman.c +++ b/src/mame/drivers/ultraman.c @@ -270,16 +270,16 @@ static MACHINE_DRIVER_START( ultraman ) MDRV_VIDEO_UPDATE(ultraman) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 24000000/6) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c index e5e1e98161e..98c5cf8d586 100644 --- a/src/mame/drivers/ultrsprt.c +++ b/src/mame/drivers/ultrsprt.c @@ -231,11 +231,11 @@ static MACHINE_DRIVER_START( ultrsprt ) MDRV_VIDEO_UPDATE(ultrsprt) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami", K054539, 48000) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static void sound_irq_callback(running_machine *machine, int irq) diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index f26d02a964c..9d6bf73cdd5 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -675,16 +675,16 @@ static MACHINE_DRIVER_START( burglarx ) MDRV_VIDEO_UPDATE(unico) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -722,16 +722,16 @@ static MACHINE_DRIVER_START( zeropnt ) MDRV_VIDEO_UPDATE(unico) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, 3579545) /* 14.31818MHz OSC divided by 4 */ - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.40) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -766,19 +766,19 @@ static MACHINE_DRIVER_START( zeropnt2 ) MDRV_VIDEO_UPDATE(zeropnt2) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 0.70) - MDRV_SOUND_ROUTE(1, "right", 0.70) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.70) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.70) MDRV_SOUND_ADD("oki1", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.40) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.40) MDRV_SOUND_ADD("oki2", OKIM6295, 3960000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) MACHINE_DRIVER_END diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index d6b1abce361..26c40c9d692 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -320,13 +320,13 @@ static MACHINE_DRIVER_START( upscope ) MDRV_VIDEO_UPDATE(amiga) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("amiga", AMIGA, 3579545) - MDRV_SOUND_ROUTE(0, "right", 0.50) - MDRV_SOUND_ROUTE(1, "left", 0.50) - MDRV_SOUND_ROUTE(2, "left", 0.50) - MDRV_SOUND_ROUTE(3, "right", 0.50) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.50) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.50) /* cia */ MDRV_CIA8520_ADD("cia_0", AMIGA_68000_NTSC_CLOCK / 10, cia_0_intf) diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index 1c94b3b855c..55a6a7300c2 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -667,16 +667,16 @@ static MACHINE_DRIVER_START( common ) MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_ym_oki ) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 14318180/4) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("oki", OKIM6295, 1789772.5 ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( sound_qs1000 ) @@ -761,21 +761,21 @@ static MACHINE_DRIVER_START( aoh ) MDRV_VIDEO_UPDATE(aoh) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("oki_1", OKIM6295, 32000000/8) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("oki_2", OKIM6295, 32000000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END /* diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index 955cd4342d8..3669a278015 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -456,17 +456,17 @@ static MACHINE_DRIVER_START( vball ) MDRV_VIDEO_UPDATE(vb) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.60) - MDRV_SOUND_ROUTE(1, "right", 0.60) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.60) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.60) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( vball2pj ) diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index d7c6368e6ea..0305a8809f6 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -555,15 +555,15 @@ static MACHINE_DRIVER_START( vendetta ) MDRV_VIDEO_UPDATE(vendetta) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579545) /* verified with PCB */ - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("konami", K053260, 3579545) /* verified with PCB */ - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index 629bdbc9f0e..e60f569296e 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -555,16 +555,16 @@ static MACHINE_DRIVER_START( vigilant ) MDRV_VIDEO_UPDATE(vigilant) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579645) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.55) - MDRV_SOUND_ROUTE(1, "right", 0.55) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.55) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.55) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( buccanrs ) @@ -598,32 +598,32 @@ static MACHINE_DRIVER_START( buccanrs ) MDRV_VIDEO_UPDATE(vigilant) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym1", YM2203, 18432000/6) MDRV_SOUND_CONFIG(ym2203_config) - MDRV_SOUND_ROUTE(0, "left", 0.35) - MDRV_SOUND_ROUTE(0, "right", 0.35) - MDRV_SOUND_ROUTE(1, "left", 0.35) - MDRV_SOUND_ROUTE(1, "right", 0.35) - MDRV_SOUND_ROUTE(2, "left", 0.35) - MDRV_SOUND_ROUTE(2, "right", 0.35) - MDRV_SOUND_ROUTE(3, "left", 0.50) - MDRV_SOUND_ROUTE(3, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.35) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.35) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.35) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.50) MDRV_SOUND_ADD("ym2", YM2203, 18432000/6) - MDRV_SOUND_ROUTE(0, "left", 0.35) - MDRV_SOUND_ROUTE(0, "right", 0.35) - MDRV_SOUND_ROUTE(1, "left", 0.35) - MDRV_SOUND_ROUTE(1, "right", 0.35) - MDRV_SOUND_ROUTE(2, "left", 0.35) - MDRV_SOUND_ROUTE(2, "right", 0.35) - MDRV_SOUND_ROUTE(3, "left", 0.50) - MDRV_SOUND_ROUTE(3, "right", 0.50) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.35) + MDRV_SOUND_ROUTE(1, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.35) + MDRV_SOUND_ROUTE(2, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(2, "rspeaker", 0.35) + MDRV_SOUND_ROUTE(3, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(3, "rspeaker", 0.50) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.35) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.35) MACHINE_DRIVER_END static MACHINE_DRIVER_START( kikcubic ) @@ -657,16 +657,16 @@ static MACHINE_DRIVER_START( kikcubic ) MDRV_VIDEO_UPDATE(kikcubic) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 3579645) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.55) - MDRV_SOUND_ROUTE(1, "right", 0.55) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.55) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.55) MDRV_SOUND_ADD("dac", DAC, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c index c7ca6749d67..06a8d04c9ae 100644 --- a/src/mame/drivers/viper.c +++ b/src/mame/drivers/viper.c @@ -620,7 +620,7 @@ static MACHINE_DRIVER_START(viper) MDRV_VIDEO_UPDATE(viper) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_M48T58_ADD( "m48t58" ) MACHINE_DRIVER_END diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index 1ae09e504a5..21bd76f9636 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -443,16 +443,16 @@ static MACHINE_DRIVER_START( varia ) MDRV_VIDEO_START(varia) MDRV_VIDEO_UPDATE(varia) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1320000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) // clock frequency & pin 7 not verified - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.75) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75) MDRV_SOUND_ADD("es", ES8712, 12000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index b745fbc0ae3..e8827a6a187 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -449,7 +449,7 @@ static MACHINE_DRIVER_START( darius2d ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */ MDRV_CPU_PROGRAM_MAP(darius2d_map,0) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(z80_sound_map,0) @@ -462,14 +462,14 @@ static MACHINE_DRIVER_START( darius2d ) MDRV_PALETTE_LENGTH(4096*2) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(40*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 3*8, 32*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -480,25 +480,25 @@ static MACHINE_DRIVER_START( darius2d ) MDRV_VIDEO_UPDATE(warriorb) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -507,7 +507,7 @@ static MACHINE_DRIVER_START( warriorb ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", M68000, 16000000) /* 16 MHz ? */ MDRV_CPU_PROGRAM_MAP(warriorb_map,0) - MDRV_CPU_VBLANK_INT("left", irq4_line_hold) + MDRV_CPU_VBLANK_INT("lscreen", irq4_line_hold) MDRV_CPU_ADD("audiocpu", Z80,16000000/4) /* 4 MHz ? */ MDRV_CPU_PROGRAM_MAP(z80_sound_map,0) @@ -520,14 +520,14 @@ static MACHINE_DRIVER_START( warriorb ) MDRV_PALETTE_LENGTH(4096*2) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(40*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 2*8, 32*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -538,25 +538,25 @@ static MACHINE_DRIVER_START( warriorb ) MDRV_VIDEO_UPDATE(warriorb) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) MDRV_SOUND_ROUTE(1, "2610.1.l", 1.0) MDRV_SOUND_ROUTE(1, "2610.1.r", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.l", 1.0) MDRV_SOUND_ROUTE(2, "2610.2.r", 1.0) MDRV_SOUND_ADD("2610.1.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.1.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("2610.2.l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("2610.2.r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index c1086563251..4b752dbda10 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -984,14 +984,14 @@ static MACHINE_DRIVER_START( wgp ) MDRV_VIDEO_UPDATE(wgp) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2610, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c index 0ea8c5b157a..0a60dbe0517 100644 --- a/src/mame/drivers/wwfsstar.c +++ b/src/mame/drivers/wwfsstar.c @@ -455,17 +455,17 @@ static MACHINE_DRIVER_START( wwfsstar ) MDRV_VIDEO_UPDATE(wwfsstar) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, XTAL_3_579545MHz) MDRV_SOUND_CONFIG(ym2151_config) - MDRV_SOUND_ROUTE(0, "left", 0.45) - MDRV_SOUND_ROUTE(1, "right", 0.45) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.45) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.45) MDRV_SOUND_ADD("oki", OKIM6295, XTAL_1_056MHz) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.47) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_DRIVER_END /******************************************************************************* diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 49aa52631d8..6a4391c1404 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -486,7 +486,7 @@ static MACHINE_DRIVER_START( xexex ) MDRV_VIDEO_UPDATE(xexex) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) MDRV_SOUND_ROUTE(0, "filter1l", 0.50) @@ -496,19 +496,19 @@ static MACHINE_DRIVER_START( xexex ) MDRV_SOUND_ADD("konami", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(0, "right", 1.0) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(0, "rspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MDRV_SOUND_ADD("filter1l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter1r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("filter2l", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MDRV_SOUND_ADD("filter2r", FILTER_VOLUME, 0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index c8440bad036..a2f0092099b 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -458,15 +458,15 @@ static MACHINE_DRIVER_START( xmen ) MDRV_VIDEO_UPDATE(xmen) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("konami", K054539, 48000) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -514,14 +514,14 @@ static MACHINE_DRIVER_START( xmen6p ) MDRV_PALETTE_LENGTH(2048) MDRV_DEFAULT_LAYOUT(layout_dualhsxs) - MDRV_SCREEN_ADD("left", RASTER) + MDRV_SCREEN_ADD("lscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_SIZE(64*8, 32*8) MDRV_SCREEN_VISIBLE_AREA(12*8, 48*8-1, 2*8, 30*8-1) - MDRV_SCREEN_ADD("right", RASTER) + MDRV_SCREEN_ADD("rscreen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -534,15 +534,15 @@ static MACHINE_DRIVER_START( xmen6p ) MDRV_VIDEO_EOF(xmen6p) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM2151, 4000000) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MDRV_SOUND_ADD("konami", K054539, 48000) - MDRV_SOUND_ROUTE(0, "left", 0.80) - MDRV_SOUND_ROUTE(1, "right", 0.80) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index a9c5919e2a0..dd17e5dd5ab 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -607,17 +607,17 @@ static MACHINE_DRIVER_START( magicbub ) MDRV_VIDEO_UPDATE(yunsun16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, 4000000) MDRV_SOUND_CONFIG(magicbub_ym3812_intf) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.20) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.20) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.20) MDRV_SOUND_ADD("oki", OKIM6295, 1056000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_DRIVER_END @@ -647,12 +647,12 @@ static MACHINE_DRIVER_START( shocking ) MDRV_VIDEO_UPDATE(yunsun16) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("oki", OKIM6295, 1000000) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 6c639ea86c9..f48378eb9ff 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -532,16 +532,16 @@ static MACHINE_DRIVER_START( yunsung8 ) MDRV_VIDEO_UPDATE(yunsung8) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("ym", YM3812, 4000000) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */ MDRV_SOUND_CONFIG(yunsung8_msm5205_interface) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) + MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) MACHINE_DRIVER_END diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 9fa9e4f2d2f..6bcaccff167 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -463,12 +463,12 @@ static MACHINE_DRIVER_START( zn1_1mb_vram ) MDRV_VIDEO_UPDATE( psx ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD( "spu", PSXSPU, 0 ) MDRV_SOUND_CONFIG( psxspu_interface ) - MDRV_SOUND_ROUTE(0, "left", 0.35) - MDRV_SOUND_ROUTE(1, "right", 0.35) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.35) MDRV_AT28C16_ADD( "at28c16", NULL ) MACHINE_DRIVER_END @@ -501,12 +501,12 @@ static MACHINE_DRIVER_START( zn2 ) MDRV_VIDEO_UPDATE( psx ) /* sound hardware */ - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD( "spu", PSXSPU, 0 ) MDRV_SOUND_CONFIG( psxspu_interface ) - MDRV_SOUND_ROUTE(0, "left", 0.35) - MDRV_SOUND_ROUTE(1, "right", 0.35) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.35) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.35) MDRV_AT28C16_ADD( "at28c16", NULL ) MACHINE_DRIVER_END @@ -707,8 +707,8 @@ static MACHINE_DRIVER_START( coh1000c ) MDRV_MACHINE_RESET( coh1000c ) MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK ) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( coh1002c ) @@ -722,8 +722,8 @@ static MACHINE_DRIVER_START( coh1002c ) MDRV_MACHINE_RESET( coh1000c ) MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK ) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* @@ -903,8 +903,8 @@ static MACHINE_DRIVER_START( coh3002c ) MDRV_MACHINE_RESET( coh3002c ) MDRV_SOUND_ADD( "qsound", QSOUND, QSOUND_CLOCK ) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END /* @@ -1229,10 +1229,10 @@ static MACHINE_DRIVER_START( coh1000ta ) MDRV_SOUND_ADD("ym", YM2610B, 16000000/2) MDRV_SOUND_CONFIG(ym2610_config) - MDRV_SOUND_ROUTE(0, "left", 0.25) - MDRV_SOUND_ROUTE(0, "right", 0.25) - MDRV_SOUND_ROUTE(1, "left", 1.0) - MDRV_SOUND_ROUTE(2, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) + MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) + MDRV_SOUND_ROUTE(1, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(2, "rspeaker", 1.0) MACHINE_DRIVER_END static WRITE32_HANDLER( taitofx1b_volume_w ) @@ -1844,8 +1844,8 @@ static MACHINE_DRIVER_START( coh1002e ) MDRV_MACHINE_RESET( coh1002e ) MDRV_SOUND_ADD( "ymf", YMF271, 16934400 ) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END @@ -2763,8 +2763,8 @@ static MACHINE_DRIVER_START( coh1002msnd ) MDRV_MACHINE_RESET( coh1002m ) MDRV_SOUND_ADD("ymz", YMZ280B, 16934400) - MDRV_SOUND_ROUTE(0, "left", 1.0) - MDRV_SOUND_ROUTE(1, "right", 1.0) + MDRV_SOUND_ROUTE(0, "lspeaker", 1.0) + MDRV_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_DRIVER_END static MACHINE_DRIVER_START( coh1002ml ) diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index af76395ea15..49bf23c8891 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -749,17 +749,17 @@ static MACHINE_DRIVER_START( zr107 ) MDRV_VIDEO_START(zr107) MDRV_VIDEO_UPDATE(zr107) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END static MACHINE_DRIVER_START( jetwave ) @@ -794,17 +794,17 @@ static MACHINE_DRIVER_START( jetwave ) MDRV_VIDEO_START(jetwave) MDRV_VIDEO_UPDATE(jetwave) - MDRV_SPEAKER_STANDARD_STEREO("left", "right") + MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MDRV_SOUND_ADD("konami1", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MDRV_SOUND_ADD("konami2", K054539, 48000) MDRV_SOUND_CONFIG(k054539_config) - MDRV_SOUND_ROUTE(0, "left", 0.75) - MDRV_SOUND_ROUTE(1, "right", 0.75) + MDRV_SOUND_ROUTE(0, "lspeaker", 0.75) + MDRV_SOUND_ROUTE(1, "rspeaker", 0.75) MACHINE_DRIVER_END /*****************************************************************************/ diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c index 9b1faf974e2..d85ef6214ba 100644 --- a/src/mame/video/cyberbal.c +++ b/src/mame/video/cyberbal.c @@ -354,7 +354,7 @@ static void update_one_screen(const device_config *screen, bitmap_t *bitmap, con rectangle *visarea = (rectangle *)video_screen_get_visible_area(screen); /* for 2p games, the left screen is the main screen */ - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); if (left_screen == NULL) left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "screen"); diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c index 0216507fb2f..ff1c677c88c 100644 --- a/src/mame/video/darius.c +++ b/src/mame/video/darius.c @@ -120,9 +120,9 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan VIDEO_UPDATE( darius ) { int xoffs = 0; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *middle_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "middle"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *middle_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "mscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) xoffs = 36*8*0; diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index 50b5e1401f5..af454135a70 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -468,8 +468,8 @@ VIDEO_UPDATE( fromanc2 ) int *scrolly = NULL; tilemap **tilemaps = NULL; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c index 62bc690eac4..8f23d88f55b 100644 --- a/src/mame/video/gaelco2.c +++ b/src/mame/video/gaelco2.c @@ -468,8 +468,8 @@ VIDEO_UPDATE( gaelco2_dual ) { int i; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); /* read scroll values */ int scroll0x = gaelco2_videoram[0x2802/2] + 0x14; diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c index 9465d1b279d..98264a457ec 100644 --- a/src/mame/video/ninjaw.c +++ b/src/mame/video/ninjaw.c @@ -152,9 +152,9 @@ VIDEO_UPDATE( ninjaw ) int xoffs = 0, screen_number = -1; UINT8 layer[3], nodraw; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *middle_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "middle"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *middle_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "mscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c index 4af376e6ce9..4c102e8b20b 100644 --- a/src/mame/video/psikyo4.c +++ b/src/mame/video/psikyo4.c @@ -125,8 +125,8 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( psikyo4 ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index 405486b05b9..fefd26c7304 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -2625,7 +2625,7 @@ VIDEO_UPDATE( multi32 ) { UINT8 enablemask; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); /* update the visible area */ if (system32_videoram[0x1ff00/2] & 0x8000) diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c index 3ef22c4ef2d..6dae787f4eb 100644 --- a/src/mame/video/subs.c +++ b/src/mame/video/subs.c @@ -41,8 +41,8 @@ VIDEO_UPDATE( subs ) { int offs; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); const device_config *discrete = devtag_get_device(screen->machine, SOUND, "discrete"); /* for every character in the Video RAM, check if it has been modified */ diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c index 34175294854..29b97abeef3 100644 --- a/src/mame/video/tbowl.c +++ b/src/mame/video/tbowl.c @@ -216,8 +216,8 @@ VIDEO_START( tbowl ) VIDEO_UPDATE( tbowl ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c index 478ea6e2aa9..9e7f47add62 100644 --- a/src/mame/video/tetrisp2.c +++ b/src/mame/video/tetrisp2.c @@ -683,8 +683,8 @@ VIDEO_UPDATE( rocknms ) int scr_pri; int rot_pri; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); /* Black background color */ if (screen == left_screen) diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index 4ba7b7acc25..9cc53644bf1 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -1173,9 +1173,9 @@ static void tx1_combine_layers(running_machine *machine, bitmap_t *bitmap, int s VIDEO_UPDATE( tx1 ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *centre_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "center"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *centre_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "cscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) { @@ -2443,9 +2443,9 @@ VIDEO_EOF( buggyboy ) VIDEO_UPDATE( buggyboy ) { - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *center_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "center"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *center_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "cscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c index a8cfc576e32..9922939af62 100644 --- a/src/mame/video/warriorb.c +++ b/src/mame/video/warriorb.c @@ -112,8 +112,8 @@ VIDEO_UPDATE( warriorb ) int xoffs = 0, screen_number = -1; UINT8 layer[3], nodraw; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) { diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c index 9adc6268462..02eac3c7fc7 100644 --- a/src/mame/video/xmen.c +++ b/src/mame/video/xmen.c @@ -135,8 +135,8 @@ VIDEO_UPDATE( xmen6p ) { int x,y; - const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "left"); - const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "right"); + const device_config *left_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "lscreen"); + const device_config *right_screen = device_list_find_by_tag(screen->machine->config->devicelist, VIDEO_SCREEN, "rscreen"); if (screen == left_screen) for(y=0;y<32*8;y++)