summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/isa/ide.cpp7
-rw-r--r--src/devices/bus/isa/mcd.cpp7
-rw-r--r--src/mame/casio/cps2000.cpp21
-rw-r--r--src/mame/itech/itech32.cpp9
-rw-r--r--src/mame/misc/xtom3d.cpp11
-rw-r--r--src/mame/nec/pc9801.cpp7
-rw-r--r--src/mame/pinball/macp.cpp8
-rw-r--r--src/mame/skeleton/alesis_qs.cpp7
-rw-r--r--src/mame/tvgames/generalplus_gp327902.cpp3
-rw-r--r--src/mame/tvgames/generalplus_gpm453x_nand.cpp3
10 files changed, 38 insertions, 45 deletions
diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp
index 9565851fafc..22ac0defe64 100644
--- a/src/devices/bus/isa/ide.cpp
+++ b/src/devices/bus/isa/ide.cpp
@@ -50,8 +50,8 @@ void isa16_ide_device::ide_interrupt(int state)
void isa16_ide_device::cdrom_headphones(device_t *device)
{
cdda_device *cdda = device->subdevice<cdda_device>("cdda");
- cdda->add_route(0, "^^lheadphone", 1.0);
- cdda->add_route(1, "^^rheadphone", 1.0);
+ cdda->add_route(0, "^^headphone", 1.0, 0);
+ cdda->add_route(1, "^^headphone", 1.0, 1);
}
static INPUT_PORTS_START( ide )
@@ -76,8 +76,7 @@ void isa16_ide_device::device_add_mconfig(machine_config &config)
IDE_CONTROLLER(config, m_ide).options(ata_devices, "hdd", nullptr, false);
m_ide->irq_handler().set(FUNC(isa16_ide_device::ide_interrupt));
- SPEAKER(config, "lheadphone").front_left();
- SPEAKER(config, "rheadphone").front_right();
+ SPEAKER(config, "headphone", 2).front();
m_ide->slot(0).set_option_machine_config("cdrom", cdrom_headphones);
m_ide->slot(1).set_option_machine_config("cdrom", cdrom_headphones);
diff --git a/src/devices/bus/isa/mcd.cpp b/src/devices/bus/isa/mcd.cpp
index 085ab3676b9..0b78d68a98f 100644
--- a/src/devices/bus/isa/mcd.cpp
+++ b/src/devices/bus/isa/mcd.cpp
@@ -26,11 +26,10 @@ DEFINE_DEVICE_TYPE(ISA16_MCD, mcd_isa_device, "mcd_isa", "Mitsumi ISA CD-ROM Ada
void mcd_isa_device::device_add_mconfig(machine_config &config)
{
- SPEAKER(config, "lheadphone").front_left();
- SPEAKER(config, "rheadphone").front_right();
+ SPEAKER(config, "headphone", 2).front();
CDDA(config, m_cdda);
- m_cdda->add_route(0, "lheadphone", 1.0);
- m_cdda->add_route(1, "rheadphone", 1.0);
+ m_cdda->add_route(0, "headphone", 1.0, 0);
+ m_cdda->add_route(1, "headphone", 1.0, 1);
m_cdda->set_cdrom_tag(*this);
}
diff --git a/src/mame/casio/cps2000.cpp b/src/mame/casio/cps2000.cpp
index eba186ad19a..df68b1f60a3 100644
--- a/src/mame/casio/cps2000.cpp
+++ b/src/mame/casio/cps2000.cpp
@@ -312,8 +312,7 @@ void cps2000_state::cps2000(machine_config &config)
MSM6200(config, m_kbd, 4.9468_MHz_XTAL);
m_kbd->irq_cb().set_inputline(m_maincpu, UPD7810_INTF1);
- SPEAKER(config, "lspeaker").front_left();
- SPEAKER(config, "rspeaker").front_right();
+ SPEAKER(config, "speaker", 2).front();
// UPD932(config, "upd932a", 4.9468_MHz_XTAL);
// UPD932(config, "upd932b", 4.9468_MHz_XTAL);
@@ -326,17 +325,17 @@ void cps2000_state::cps2000(machine_config &config)
FILTER_RC(config, "bass_rc1").set_lowpass(RES_K(47), CAP_N(47)).add_route(0, "bass_rc2", 1.0);
FILTER_RC(config, "bass_rc2").set_lowpass(RES_K(22), CAP_N(47))
- .add_route(0, "lspeaker", 0.25).add_route(0, "rspeaker", 0.25);
+ .add_route(0, "speaker", 0.25, 0).add_route(0, "speaker", 0.25, 1);
UPD934G(config, m_pcm, 4.9468_MHz_XTAL / 4);
- m_pcm->add_route(0, "lspeaker", 0.25);
- m_pcm->add_route(0, "rspeaker", 0.125);
- m_pcm->add_route(1, "lspeaker", 0.25);
- m_pcm->add_route(1, "rspeaker", 0.125);
- m_pcm->add_route(2, "lspeaker", 0.125);
- m_pcm->add_route(2, "rspeaker", 0.25);
- m_pcm->add_route(3, "lspeaker", 0.125);
- m_pcm->add_route(3, "rspeaker", 0.25);
+ m_pcm->add_route(0, "speaker", 0.25, 0);
+ m_pcm->add_route(0, "speaker", 0.125, 1);
+ m_pcm->add_route(1, "speaker", 0.25, 0);
+ m_pcm->add_route(1, "speaker", 0.125, 1);
+ m_pcm->add_route(2, "speaker", 0.125, 0);
+ m_pcm->add_route(2, "speaker", 0.25, 1);
+ m_pcm->add_route(3, "speaker", 0.125, 0);
+ m_pcm->add_route(3, "speaker", 0.25, 1);
}
/**************************************************************************/
diff --git a/src/mame/itech/itech32.cpp b/src/mame/itech/itech32.cpp
index ceb01d738a1..ca31776556d 100644
--- a/src/mame/itech/itech32.cpp
+++ b/src/mame/itech/itech32.cpp
@@ -1867,12 +1867,13 @@ void drivedge_state::drivedge(machine_config &config)
m_screen->screen_vblank().set_nop(); // interrupt not used?
- SPEAKER(config, "left_back").front_left(); // Sound PCB has hook-ups & AMPs for 5 channels
- SPEAKER(config, "right_back").front_right(); // As per Sound Tests Menu: Left Front, Right Front, Left Rear, Right Rear, Under Seat
+ // Sound PCB has hook-ups & AMPs for 5 channels
+ // As per Sound Tests Menu: Left Front, Right Front, Left Rear, Right Rear, Under Seat
+ SPEAKER(config, "back", 2).rear();
m_ensoniq->set_channels(2);
- m_ensoniq->add_route(2, "right_back", 0.1); // swapped stereo
- m_ensoniq->add_route(3, "left_back", 0.1);
+ m_ensoniq->add_route(2, "back", 0.1, 1); // swapped stereo
+ m_ensoniq->add_route(3, "back", 0.1, 0);
}
void shoottv_state::shoottv(machine_config &config)
diff --git a/src/mame/misc/xtom3d.cpp b/src/mame/misc/xtom3d.cpp
index d714f134d9b..e479ac7a535 100644
--- a/src/mame/misc/xtom3d.cpp
+++ b/src/mame/misc/xtom3d.cpp
@@ -661,8 +661,8 @@ void xtom3d_state::romdisk_config(device_t *device)
void xtom3d_state::piu10_config(device_t *device)
{
isa16_piu10 &piu10 = *downcast<isa16_piu10 *>(device);
- piu10.add_route(0, ":lmicrophone", 0.25);
- piu10.add_route(1, ":rmicrophone", 0.25);
+ piu10.add_route(0, ":microphone", 0.25, 0);
+ piu10.add_route(1, ":microphone", 0.25, 1);
}
// TODO: unverified PCI config space
@@ -728,16 +728,15 @@ void xtom3d_state::xtom3d(machine_config &config)
// TODO: stub for drive options (speed/drive type etc.)
static void cdrom_config(device_t *device)
{
- device->subdevice<cdda_device>("cdda")->add_route(0, ":lmicrophone", 0.25);
- device->subdevice<cdda_device>("cdda")->add_route(1, ":rmicrophone", 0.25);
+ device->subdevice<cdda_device>("cdda")->add_route(0, ":microphone", 0.25, 0);
+ device->subdevice<cdda_device>("cdda")->add_route(1, ":microphone", 0.25, 1);
}
void xtom3d_state::pumpitup(machine_config &config)
{
xtom3d(config);
- SPEAKER(config, "lmicrophone").front_left();
- SPEAKER(config, "rmicrophone").front_right();
+ SPEAKER(config, "microphone", 2).front();
m_pci_ide->subdevice<bus_master_ide_controller_device>("ide1")->slot(0).set_default_option("cdrom");
m_pci_ide->subdevice<bus_master_ide_controller_device>("ide1")->slot(0).set_option_machine_config("cdrom", cdrom_config);
diff --git a/src/mame/nec/pc9801.cpp b/src/mame/nec/pc9801.cpp
index c9e7bcb0211..641d6426563 100644
--- a/src/mame/nec/pc9801.cpp
+++ b/src/mame/nec/pc9801.cpp
@@ -2343,14 +2343,13 @@ void pc9801_state::pc9801_sasi(machine_config &config)
void pc9801vm_state::cdrom_headphones(device_t *device)
{
cdda_device *cdda = device->subdevice<cdda_device>("cdda");
- cdda->add_route(0, "^^lheadphone", 1.0);
- cdda->add_route(1, "^^rheadphone", 1.0);
+ cdda->add_route(0, "^^headphone", 1.0, 0);
+ cdda->add_route(1, "^^headphone", 1.0, 1);
}
void pc9801vm_state::pc9801_ide(machine_config &config)
{
- SPEAKER(config, "lheadphone").front_left();
- SPEAKER(config, "rheadphone").front_right();
+ SPEAKER(config, "headphone", 2).front();
ATA_INTERFACE(config, m_ide[0]).options(ata_devices, "hdd", nullptr, false);
m_ide[0]->irq_handler().set("ideirq", FUNC(input_merger_device::in_w<0>));
ATA_INTERFACE(config, m_ide[1]).options(pc9801_atapi_devices, "pc98_cd", nullptr, false);
diff --git a/src/mame/pinball/macp.cpp b/src/mame/pinball/macp.cpp
index 9ae7e1ae167..3805fa57246 100644
--- a/src/mame/pinball/macp.cpp
+++ b/src/mame/pinball/macp.cpp
@@ -363,20 +363,20 @@ void macp_state::mac16k(machine_config &config)
genpin_audio(config);
//2x AY8910
- SPEAKER(config, "lspkr").front_left();
+ SPEAKER(config, "speaker", 2).front();
+
AY8910(config, m_ay8910[0], 3'800'000/2);
m_ay8910[0]->set_resistors_load(10e3,10e3,10e3);
m_ay8910[0]->port_a_write_callback().set(FUNC(macp_state::ay0_a_w));
m_ay8910[0]->port_b_write_callback().set(FUNC(macp_state::ay0_b_w));
- m_ay8910[0]->add_route(ALL_OUTPUTS, "lspkr", 0.50);
+ m_ay8910[0]->add_route(ALL_OUTPUTS, "speaker", 0.50, 0);
- SPEAKER(config, "rspkr").front_right();
AY8910(config, m_ay8910[1], 3'800'000/2);
m_ay8910[1]->set_resistors_load(10e3,10e3,10e3);
m_ay8910[1]->port_a_write_callback().set(FUNC(macp_state::ay1_a_w));
m_ay8910[1]->port_b_write_callback().set(FUNC(macp_state::ay1_b_w));
m_ay8910[1]->port_b_read_callback().set(FUNC(macp_state::ay1_b_r));
- m_ay8910[1]->add_route(ALL_OUTPUTS, "rspkr", 0.50);
+ m_ay8910[1]->add_route(ALL_OUTPUTS, "speaker", 0.50, 1);
}
void macp_state::mac32k(machine_config &config)
diff --git a/src/mame/skeleton/alesis_qs.cpp b/src/mame/skeleton/alesis_qs.cpp
index af28367e06e..73fe9aa2683 100644
--- a/src/mame/skeleton/alesis_qs.cpp
+++ b/src/mame/skeleton/alesis_qs.cpp
@@ -71,11 +71,10 @@ void qs_state::qs7(machine_config &config)
//TODO: add LCD display controller here
/* sound hardware */
- //SPEAKER(config, "left").front_left();
- //SPEAKER(config, "right").front_right();
+ //SPEAKER(config, "speaker", 2).front();
//alesis_qs_series_device &sound(ALESIS_QS_SERIES(config, "sound", SND_CLOCK));
- //sound.add_route(0, "left", 1.0);
- //sound.add_route(1, "right", 1.0);
+ //sound.add_route(0, "speaker", 1.0, 0);
+ //sound.add_route(1, "speaker", 1.0, 1);
/* Interfaces */
//PCMCIA
diff --git a/src/mame/tvgames/generalplus_gp327902.cpp b/src/mame/tvgames/generalplus_gp327902.cpp
index 6b142d7c26a..b9ca53e121e 100644
--- a/src/mame/tvgames/generalplus_gp327902.cpp
+++ b/src/mame/tvgames/generalplus_gp327902.cpp
@@ -133,8 +133,7 @@ void generalplus_gp327902_game_state::gp327902(machine_config &config)
m_screen->set_visarea(0, 320-1, 0, 240-1);
m_screen->set_screen_update(FUNC(generalplus_gp327902_game_state::screen_update_gp327902));
- SPEAKER(config, "lspeaker").front_left();
- SPEAKER(config, "rspeaker").front_right();
+ SPEAKER(config, "speaker", 2).front();
TIMER(config, "timer").configure_periodic(FUNC(generalplus_gp327902_game_state::timer), attotime::from_hz(1000));
}
diff --git a/src/mame/tvgames/generalplus_gpm453x_nand.cpp b/src/mame/tvgames/generalplus_gpm453x_nand.cpp
index 124e4825bda..90daafa1b53 100644
--- a/src/mame/tvgames/generalplus_gpm453x_nand.cpp
+++ b/src/mame/tvgames/generalplus_gpm453x_nand.cpp
@@ -91,8 +91,7 @@ void generalplus_gpm453x_game_state::gpm453x(machine_config &config)
m_screen->set_visarea(0, 320-1, 0, 240-1);
m_screen->set_screen_update(FUNC(generalplus_gpm453x_game_state::screen_update));
- SPEAKER(config, "lspeaker").front_left();
- SPEAKER(config, "rspeaker").front_right();
+ SPEAKER(config, "speaker", 2).front();
}
ROM_START( leapland )