diff options
Diffstat (limited to 'src/devices/bus')
-rw-r--r-- | src/devices/bus/isa/ide.cpp | 7 | ||||
-rw-r--r-- | src/devices/bus/isa/mcd.cpp | 7 | ||||
-rw-r--r-- | src/devices/bus/odyssey2/voice.cpp | 2 |
3 files changed, 7 insertions, 9 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/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index 9ca1ea26101..678757bb775 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -139,7 +139,7 @@ void o2_voice_device::device_add_mconfig(machine_config &config) // The Voice uses a speaker with its own volume control so the relative volumes to use are subjective, these sound good m_speech->add_route(ALL_OUTPUTS, "mono", 1.00); - O2_CART_SLOT(config, m_subslot, o2_cart, nullptr); + O2_CART_SLOT(config, m_subslot, o2_cart, nullptr).set_must_be_loaded(true); } ROM_START( o2voice ) |