diff options
author | 2019-07-06 02:45:26 +1000 | |
---|---|---|
committer | 2019-07-06 02:45:26 +1000 | |
commit | 4e2959b5c0e40019bf944b2b503ef71c1a60e8f5 (patch) | |
tree | 8ae077f1e2554ded8eb4ea7805cbc80bdf39678d | |
parent | 46261ff71b1c2fa64a9a97baac86439723f07dd7 (diff) |
(nw) removal of wave.h part 2
59 files changed, 62 insertions, 107 deletions
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index f7deb0e9447..2086d174ba1 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -516,8 +516,6 @@ void abc80_state::abc80(machine_config &config) m_csg->set_oneshot_params(CAP_U(0.1), RES_K(330)); m_csg->add_route(ALL_OUTPUTS, "mono", 0.25); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); - // devices Z80PIO(config, m_pio, XTAL(11'980'800)/2/2); m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); @@ -527,6 +525,7 @@ void abc80_state::abc80(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("abc80_cass"); ABC80_KEYBOARD(config, m_kb, 0); diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp index ef94ced78f4..4efb9c5f9c1 100644 --- a/src/mame/drivers/aim65.cpp +++ b/src/mame/drivers/aim65.cpp @@ -238,8 +238,6 @@ void aim65_state::aim65(machine_config &config) /* Sound - wave sound only */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette1).add_route(ALL_OUTPUTS, "mono", 0.1); - WAVE(config, "wave2", m_cassette2).add_route(ALL_OUTPUTS, "mono", 0.1); /* other devices */ MOS6532_NEW(config, m_riot, AIM65_CLOCK); @@ -269,8 +267,10 @@ void aim65_state::aim65(machine_config &config) CASSETTE(config, m_cassette1); m_cassette1->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette1->add_route(ALL_OUTPUTS, "mono", 0.1); CASSETTE(config, m_cassette2); m_cassette2->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette2->add_route(ALL_OUTPUTS, "mono", 0.1); // Screen for TTY interface. Index 1. RS232_PORT(config, m_rs232, default_rs232_devices, "terminal"); diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp index 2312cc3a958..929c08c7a36 100644 --- a/src/mame/drivers/b2m.cpp +++ b/src/mame/drivers/b2m.cpp @@ -11,7 +11,6 @@ #include "emu.h" #include "cpu/i8085/i8085.h" -#include "imagedev/cassette.h" #include "machine/i8255.h" #include "machine/pic8259.h" #include "machine/i8251.h" diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp index c7580481ae4..49942d0621f 100644 --- a/src/mame/drivers/coco12.cpp +++ b/src/mame/drivers/coco12.cpp @@ -393,8 +393,6 @@ void coco_state::coco_sound(machine_config &config) // Single-bit sound: R22 = 10K DAC_1BIT(config, "sbs", 0).add_route(ALL_OUTPUTS, "speaker", 0.125); - - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "speaker", 0.25); } @@ -464,9 +462,13 @@ void coco12_state::coco(machine_config &config) // Becker Port device COCO_DWSOCK(config, DWSOCK_TAG, 0); + // sound hardware + coco_sound(config); + CASSETTE(config, m_cassette); m_cassette->set_formats(coco_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.15); rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, "printer")); rs232.dcd_handler().set(PIA1_TAG, FUNC(pia6821_device::ca1_w)); @@ -486,9 +488,6 @@ void coco12_state::coco(machine_config &config) m_vdg->fsync_wr_callback().set(FUNC(coco12_state::field_sync)); m_vdg->input_callback().set(m_sam, FUNC(sam6883_device::display_read)); - // sound hardware - coco_sound(config); - // internal ram RAM(config, m_ram).set_default_size("64K").set_extra_options("4K,16K,32K"); diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp index 300fe14c83e..d64171d14ab 100644 --- a/src/mame/drivers/coco3.cpp +++ b/src/mame/drivers/coco3.cpp @@ -273,9 +273,13 @@ void coco3_state::coco3(machine_config &config) // Becker Port device COCO_DWSOCK(config, DWSOCK_TAG, 0); + // sound hardware + coco_sound(config); + CASSETTE(config, m_cassette); m_cassette->set_formats(coco_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.15); rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, "printer")); rs232.dcd_handler().set(PIA1_TAG, FUNC(pia6821_device::ca1_w)); @@ -316,9 +320,6 @@ void coco3_state::coco3(machine_config &config) rgb_screen.set_visarea(0, 640-1, 1, 241-1); rgb_screen.set_vblank_time(0); - // sound hardware - coco_sound(config); - // internal ram RAM(config, RAM_TAG).set_default_size("512K").set_extra_options("128K,2M,8M"); diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index 017317c3bd2..e596b752045 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -633,6 +633,7 @@ void comx35_state::base(machine_config &config, const XTAL clock) QUICKLOAD(config, "quickload", "comx").set_load_callback(FUNC(comx35_state::quickload_cb), this); CASSETTE(config, m_cassette).set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + //m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); // expansion bus COMX_EXPANSION_SLOT(config, m_exp, 0, comx_expansion_cards, "eb").irq_callback().set(FUNC(comx35_state::irq_w)); diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp index 91fea7e666c..7eb9b1c8ee4 100644 --- a/src/mame/drivers/crvision.cpp +++ b/src/mame/drivers/crvision.cpp @@ -746,8 +746,15 @@ void crvision_state::creativision(machine_config &config) m_pia->writepa_handler().set(FUNC(crvision_state::pia_pa_w)); m_pia->writepb_handler().set(SN76489_TAG, FUNC(sn76496_base_device::write)); + // sound hardware + SPEAKER(config, "mono").front_center(); + SN76489A(config, m_psg, XTAL(2'000'000)); + m_psg->ready_cb().set(m_pia, FUNC(pia6821_device::cb1_w)); + m_psg->add_route(ALL_OUTPUTS, "mono", 1.00); + CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->busy_handler().set("cent_status_in", FUNC(input_buffer_device::write_bit7)); @@ -759,14 +766,6 @@ void crvision_state::creativision(machine_config &config) OUTPUT_LATCH(config, "cent_ctrl_out").bit_handler<4>().set(m_centronics, FUNC(centronics_device::write_strobe)); - // sound hardware - SPEAKER(config, "mono").front_center(); - SN76489A(config, m_psg, XTAL(2'000'000)); - m_psg->ready_cb().set(m_pia, FUNC(pia6821_device::cb1_w)); - m_psg->add_route(ALL_OUTPUTS, "mono", 1.00); - - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); - // cartridge CRVISION_CART_SLOT(config, m_cart, crvision_cart, nullptr); @@ -829,8 +828,15 @@ void laser2001_state::lasr2001(machine_config &config) m_pia->ca2_handler().set(FUNC(laser2001_state::pia_ca2_w)); m_pia->cb2_handler().set(FUNC(laser2001_state::pia_cb2_w)); + // sound hardware + SPEAKER(config, "mono").front_center(); + SN76489A(config, m_psg, XTAL(17'734'470)/9); + m_psg->ready_cb().set(FUNC(laser2001_state::write_psg_ready)); + m_psg->add_route(ALL_OUTPUTS, "mono", 1.00); + CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); CENTRONICS(config, m_centronics, centronics_devices, "printer"); m_centronics->busy_handler().set(FUNC(laser2001_state::write_centronics_busy)); @@ -845,14 +851,6 @@ void laser2001_state::lasr2001(machine_config &config) vdp.int_callback().set_inputline(M6502_TAG, m6502_device::IRQ_LINE); SCREEN(config, "screen", SCREEN_TYPE_RASTER); - // sound hardware - SPEAKER(config, "mono").front_center(); - SN76489A(config, m_psg, XTAL(17'734'470)/9); - m_psg->ready_cb().set(FUNC(laser2001_state::write_psg_ready)); - m_psg->add_route(ALL_OUTPUTS, "mono", 1.00); - - WAVE(config, "wave", m_cassette).add_route(1, "mono", 0.25); - // cartridge CRVISION_CART_SLOT(config, m_cart, crvision_cart, nullptr); diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp index a3d7156fe33..954d3977b65 100644 --- a/src/mame/drivers/dai.cpp +++ b/src/mame/drivers/dai.cpp @@ -221,7 +221,6 @@ void dai_state::dai(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); DAI_SOUND(config, m_sound).add_route(0, "lspeaker", 0.50).add_route(1, "rspeaker", 0.50); @@ -229,6 +228,7 @@ void dai_state::dai(machine_config &config) /* cassette */ CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("dai_cass"); /* tms5501 */ diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp index a8c751d85d4..e00de4a4b71 100644 --- a/src/mame/drivers/kc.cpp +++ b/src/mame/drivers/kc.cpp @@ -135,7 +135,6 @@ void kc_state::kc85_3(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ @@ -144,6 +143,7 @@ void kc_state::kc85_3(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(kc_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("kc_cass"); /* cartridge slot */ @@ -213,7 +213,6 @@ void kc85_4_state::kc85_4(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ @@ -222,6 +221,7 @@ void kc85_4_state::kc85_4(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(kc_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("kc_cass"); /* cartridge slot */ diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp index 755fba72681..db19860afee 100644 --- a/src/mame/drivers/mbee.cpp +++ b/src/mame/drivers/mbee.cpp @@ -675,7 +675,6 @@ void mbee_state::mbee(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ @@ -699,6 +698,7 @@ void mbee_state::mbee(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(mbee_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); } @@ -734,7 +734,6 @@ void mbee_state::mbeeic(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* devices */ @@ -758,6 +757,7 @@ void mbee_state::mbeeic(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(mbee_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); } void mbee_state::mbeepc(machine_config &config) diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp index 22bdb2f9190..9e5aac585d4 100644 --- a/src/mame/drivers/msx.cpp +++ b/src/mame/drivers/msx.cpp @@ -1372,7 +1372,6 @@ void msx_state::msx(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); AY8910(config, m_ay8910, 10.738635_MHz_XTAL / 3 / 2); m_ay8910->set_flags(AY8910_SINGLE_OUTPUT); m_ay8910->port_a_read_callback().set(FUNC(msx_state::msx_psg_port_a_r)); @@ -1396,6 +1395,7 @@ void msx_state::msx(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(fmsx_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05); m_cassette->set_interface("msx_cass"); /* Software lists */ @@ -1444,7 +1444,6 @@ void msx2_state::msx2(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); AY8910(config, m_ay8910, 21.477272_MHz_XTAL / 6 / 2); m_ay8910->set_flags(AY8910_SINGLE_OUTPUT); m_ay8910->port_a_read_callback().set(FUNC(msx2_state::msx_psg_port_a_r)); @@ -1468,6 +1467,7 @@ void msx2_state::msx2(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(fmsx_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05); m_cassette->set_interface("msx_cass"); /* real time clock */ @@ -1507,7 +1507,6 @@ void msx2_state::msx2p(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); AY8910(config, m_ay8910, 21.477272_MHz_XTAL / 6 / 2); m_ay8910->set_flags(AY8910_SINGLE_OUTPUT); m_ay8910->port_a_read_callback().set(FUNC(msx2_state::msx_psg_port_a_r)); @@ -1531,6 +1530,7 @@ void msx2_state::msx2p(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(fmsx_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05); m_cassette->set_interface("msx_cass"); /* real time clock */ diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp index e54591a6114..9983abf5449 100644 --- a/src/mame/drivers/mz80.cpp +++ b/src/mame/drivers/mz80.cpp @@ -300,7 +300,6 @@ void mz80_state::mz80k(machine_config &config) /* Audio */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); /* Devices */ @@ -322,6 +321,7 @@ void mz80_state::mz80k(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(mz700_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); } void mz80_state::mz80kj(machine_config &config) diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp index 0775ea26524..94cdec70b03 100644 --- a/src/mame/drivers/orion.cpp +++ b/src/mame/drivers/orion.cpp @@ -116,11 +116,11 @@ void orion_state::orion128(machine_config &config) PALETTE(config, m_palette, FUNC(orion_state::orion128_palette), 18); SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); auto &cassette(CASSETTE(config, "cassette")); cassette.set_formats(rko_cassette_formats); cassette.set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); + cassette.add_route(ALL_OUTPUTS, "mono", 0.05); cassette.set_interface("orion_cass"); SOFTWARE_LIST(config, "cass_list").set_original("orion_cass"); @@ -189,7 +189,6 @@ void orion_z80_state::orionz80(machine_config &config) SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.0); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); auto &ay8912(AY8912(config, "ay8912", 1773400)); ay8912.add_route(ALL_OUTPUTS, "mono", 1.00); @@ -197,6 +196,7 @@ void orion_z80_state::orionz80(machine_config &config) auto &cassette(CASSETTE(config, "cassette")); cassette.set_formats(rko_cassette_formats); cassette.set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); + cassette.add_route(ALL_OUTPUTS, "mono", 0.05); cassette.set_interface("orion_cass"); SOFTWARE_LIST(config, "cass_list").set_original("orion_cass"); @@ -262,13 +262,13 @@ void orion_pro_state::orionpro(machine_config &config) SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.0); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); auto &ay8912(AY8912(config, "ay8912", 1773400)); ay8912.add_route(ALL_OUTPUTS, "mono", 1.00); auto &cassette(CASSETTE(config, "cassette")); cassette.set_formats(rko_cassette_formats); cassette.set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); + cassette.add_route(ALL_OUTPUTS, "mono", 0.05); cassette.set_interface("orion_cass"); SOFTWARE_LIST(config, "cass_list").set_original("orion_cass"); diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp index 38fcea1268d..a357b430de0 100644 --- a/src/mame/drivers/pc6001.cpp +++ b/src/mame/drivers/pc6001.cpp @@ -1509,6 +1509,7 @@ void pc6001_state::pc6001(machine_config &config) // CASSETTE(config, m_cassette); // m_cassette->set_formats(pc6001_cassette_formats); // m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); +// m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); GENERIC_CARTSLOT(config, m_cas_hack, generic_plain_slot, "pc6001_cass", "cas,p6"); SPEAKER(config, "mono").front_center(); @@ -1516,7 +1517,6 @@ void pc6001_state::pc6001(machine_config &config) ay8910.port_a_read_callback().set_ioport("P1"); ay8910.port_b_read_callback().set_ioport("P2"); ay8910.add_route(ALL_OUTPUTS, "mono", 1.00); -// WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); /* TODO: accurate timing on this */ TIMER(config, "keyboard_timer").configure_periodic(FUNC(pc6001_state::keyboard_callback), attotime::from_hz(250)); diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp index ce75201c8c5..9342dede5f7 100644 --- a/src/mame/drivers/phc25.cpp +++ b/src/mame/drivers/phc25.cpp @@ -321,12 +321,12 @@ void phc25_state::phc25(machine_config &config) psg.port_a_read_callback().set_ioport("JOY0"); psg.port_b_read_callback().set_ioport("JOY1"); psg.add_route(ALL_OUTPUTS, "mono", 1.00); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.15); /* devices */ CASSETTE(config, m_cassette); m_cassette->set_formats(phc25_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.15); m_cassette->set_interface("phc25_cass"); CENTRONICS(config, m_centronics, centronics_devices, "printer"); diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp index 87175c493a4..eb3bb7fb4e0 100644 --- a/src/mame/drivers/pk8020.cpp +++ b/src/mame/drivers/pk8020.cpp @@ -305,9 +305,9 @@ void pk8020_state::pk8020(machine_config &config) /* audio hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); - CASSETTE(config, "cassette").set_default_state(CASSETTE_PLAY); + //CASSETTE(config, m_cass).set_default_state(CASSETTE_PLAY); + //m_cass->add_route(ALL_OUTPUTS, "mono", 0.05); CENTRONICS(config, m_printer, centronics_devices, nullptr); m_printer->busy_handler().set(m_inr, FUNC(pic8259_device::ir6_w)).invert(); diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp index 1429edfdae6..1c895733224 100644 --- a/src/mame/drivers/poly880.cpp +++ b/src/mame/drivers/poly880.cpp @@ -279,10 +279,10 @@ void poly880_state::poly880(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); /* internal ram */ RAM(config, RAM_TAG).set_default_size("1K"); diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp index 89392fac344..6eaebcb6478 100644 --- a/src/mame/drivers/pp01.cpp +++ b/src/mame/drivers/pp01.cpp @@ -227,7 +227,6 @@ void pp01_state::pp01(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); - //WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05); /* Devices */ I8251(config, "uart", 0); diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp index 512c5b56246..f7672deb7f6 100644 --- a/src/mame/drivers/px8.cpp +++ b/src/mame/drivers/px8.cpp @@ -769,7 +769,6 @@ void px8_state::px8(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(0, "mono", 0.05); /* cartridge */ GENERIC_CARTSLOT(config, "capsule1", generic_plain_slot, "px8_cart", "bin,rom"); @@ -781,6 +780,7 @@ void px8_state::px8(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(0, "mono", 0.05); /* internal ram */ RAM(config, RAM_TAG).set_default_size("64K"); diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp index e8fada889bd..1ed21008c82 100644 --- a/src/mame/drivers/sorcerer.cpp +++ b/src/mame/drivers/sorcerer.cpp @@ -427,8 +427,6 @@ void sorcerer_state::sorcerer(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette1).add_route(ALL_OUTPUTS, "mono", 0.05); // cass1 speaker - WAVE(config, "wave2", m_cassette2).add_route(ALL_OUTPUTS, "mono", 0.05); // cass2 speaker AY31015(config, m_uart); m_uart->set_auto_rdav(true); @@ -454,11 +452,13 @@ void sorcerer_state::sorcerer(machine_config &config) CASSETTE(config, m_cassette1); m_cassette1->set_formats(sorcerer_cassette_formats); m_cassette1->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette1->add_route(ALL_OUTPUTS, "mono", 0.05); // cass1 speaker m_cassette1->set_interface("sorcerer_cass"); CASSETTE(config, m_cassette2); m_cassette2->set_formats(sorcerer_cassette_formats); m_cassette2->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette2->add_route(ALL_OUTPUTS, "mono", 0.05); // cass2 speaker m_cassette2->set_interface("sorcerer_cass"); /* cartridge */ diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp index d96f398d97f..9940626739d 100644 --- a/src/mame/drivers/special.cpp +++ b/src/mame/drivers/special.cpp @@ -389,8 +389,6 @@ void special_state::special(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); - /* Devices */ I8255(config, m_ppi); m_ppi->in_pa_callback().set(FUNC(special_state::specialist_8255_porta_r)); @@ -403,6 +401,7 @@ void special_state::special(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(rks_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05); m_cassette->set_interface("special_cass"); SOFTWARE_LIST(config, "cass_list").set_original("special_cass"); @@ -502,12 +501,11 @@ void special_state::erik(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); - /* Devices */ CASSETTE(config, m_cassette); m_cassette->set_formats(rks_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05); m_cassette->set_interface("special_cass"); I8255(config, m_ppi); diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index 54cb5293b82..abd591d24a1 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -734,7 +734,6 @@ void super80_state::super80(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); SAMPLES(config, m_samples); m_samples->set_channels(1); @@ -756,6 +755,7 @@ void super80_state::super80(machine_config &config) /* cassette */ CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("super80_cass"); TIMER(config, "kansas_r").configure_periodic(FUNC(super80_state::kansas_r), attotime::from_hz(40000)); // cass read @@ -827,7 +827,6 @@ void super80_state::super80v(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50); SAMPLES(config, m_samples); m_samples->set_channels(1); @@ -849,6 +848,7 @@ void super80_state::super80v(machine_config &config) /* cassette */ CASSETTE(config, m_cassette); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("super80_cass"); TIMER(config, "kansas_r").configure_periodic(FUNC(super80_state::kansas_r), attotime::from_hz(40000)); // cass read diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index fee0761731a..62bb9a32ce6 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -521,10 +521,10 @@ void trs80_state::trs80(machine_config &config) // the original model I, l /* sound hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); /* devices */ CASSETTE(config, m_cassette); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); } void trs80_state::model1(machine_config &config) // model I, level II diff --git a/src/mame/drivers/trs80m3.cpp b/src/mame/drivers/trs80m3.cpp index 9236d82d1aa..114671e0bf2 100644 --- a/src/mame/drivers/trs80m3.cpp +++ b/src/mame/drivers/trs80m3.cpp @@ -353,12 +353,12 @@ void trs80m3_state::model3(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); /* devices */ CASSETTE(config, m_cassette); m_cassette->set_formats(trs80l2_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); QUICKLOAD(config, "quickload", "cmd", attotime::from_seconds(1)).set_load_callback(FUNC(trs80m3_state::quickload_cb), this); diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index 1ee9d5ca6b8..6fe1196a35c 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -215,8 +215,6 @@ void ut88_state::ut88(machine_config &config) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0)); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); - /* Devices */ I8255A(config, m_ppi); m_ppi->out_pa_callback().set(FUNC(ut88_state::ut88_8255_porta_w)); @@ -226,6 +224,7 @@ void ut88_state::ut88(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(rku_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05); m_cassette->set_interface("ut88_cass"); SOFTWARE_LIST(config, "cass_list").set_original("ut88"); @@ -245,11 +244,11 @@ void ut88_state::ut88mini(machine_config &config) /* Cassette */ SPEAKER(config, "speaker").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05); CASSETTE(config, m_cassette); m_cassette->set_formats(rku_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05); m_cassette->set_interface("ut88_cass"); SOFTWARE_LIST(config, "cass_list").set_original("ut88"); diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp index 0fb132ba475..b273447b551 100644 --- a/src/mame/drivers/vc4000.cpp +++ b/src/mame/drivers/vc4000.cpp @@ -594,8 +594,8 @@ void vc4000_state::elektor(machine_config &config) { vc4000(config); m_maincpu->set_addrmap(AS_PROGRAM, &vc4000_state::elektor_mem); - CASSETTE(config, "cassette"); - WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); + CASSETTE(config, m_cassette); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); } diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index e4be0977726..438fdd3b422 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1501,7 +1501,6 @@ void x07_state::x07(machine_config &config) /* sound hardware */ SPEAKER(config, "mono").front_center(); BEEP(config, "beeper", 0).add_route(ALL_OUTPUTS, "mono", 0.50); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); /* printer */ PRINTER(config, m_printer, 0); @@ -1526,6 +1525,7 @@ void x07_state::x07(machine_config &config) CASSETTE(config, m_cassette); m_cassette->set_formats(x07_cassette_formats); m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("x07_cass"); /* Software lists */ diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp index 24bf556be9c..999024d83ce 100644 --- a/src/mame/drivers/x1.cpp +++ b/src/mame/drivers/x1.cpp @@ -2263,11 +2263,11 @@ void x1_state::x1(machine_config &config) ay.add_route(0, "rspeaker", 0.25); ay.add_route(1, "lspeaker", 0.5); ay.add_route(2, "rspeaker", 0.5); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "lspeaker", 0.25).add_route(ALL_OUTPUTS, "rspeaker", 0.10); CASSETTE(config, m_cassette); m_cassette->set_formats(x1_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "lspeaker", 0.25).add_route(ALL_OUTPUTS, "rspeaker", 0.10); m_cassette->set_interface("x1_cass"); SOFTWARE_LIST(config, "cass_list").set_original("x1_cass"); diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 292905b3f9b..056201271c3 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -506,11 +506,11 @@ void x1twin_state::x1twin(machine_config &config) ay.add_route(0, "x1_r", 0.25); ay.add_route(1, "x1_l", 0.5); ay.add_route(2, "x1_r", 0.5); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "x1_l", 0.25).add_route(ALL_OUTPUTS, "x1_r", 0.10); CASSETTE(config, m_cassette); m_cassette->set_formats(x1_cassette_formats); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "x1_l", 0.25).add_route(ALL_OUTPUTS, "x1_r", 0.10); m_cassette->set_interface("x1_cass"); SOFTWARE_LIST(config, "cass_list").set_original("x1_cass"); diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp index 5d0c284d25a..c45ed00070e 100644 --- a/src/mame/drivers/zx.cpp +++ b/src/mame/drivers/zx.cpp @@ -334,14 +334,14 @@ void zx_state::zx80(machine_config &config) PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED); + SPEAKER(config, "mono").front_center(); + CASSETTE(config, m_cassette); m_cassette->set_formats(zx80_o_format); m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED); + m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05); m_cassette->set_interface("zx80_cass"); - SPEAKER(config, "mono").front_center(); - WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05); - /* software lists */ SOFTWARE_LIST(config, m_softlist).set_original("zx80_cass"); diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h index a89d3a9f2ad..fd21f1e076d 100644 --- a/src/mame/includes/abc80.h +++ b/src/mame/includes/abc80.h @@ -22,7 +22,6 @@ #include "machine/ram.h" #include "machine/z80pio.h" #include "sound/sn76477.h" -#include "sound/wave.h" #include "emupal.h" #define ABC80_HTOTAL 384 diff --git a/src/mame/includes/aim65.h b/src/mame/includes/aim65.h index be2b9370fbd..f08125ba509 100644 --- a/src/mame/includes/aim65.h +++ b/src/mame/includes/aim65.h @@ -21,7 +21,6 @@ #include "machine/6821pia.h" #include "machine/mos6530n.h" #include "machine/ram.h" -#include "sound/wave.h" #include "video/dl1416.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/includes/b2m.h b/src/mame/includes/b2m.h index 2b57fd3c2f6..67075a29215 100644 --- a/src/mame/includes/b2m.h +++ b/src/mame/includes/b2m.h @@ -18,7 +18,6 @@ #include "machine/ram.h" #include "machine/wd_fdc.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "emupal.h" class b2m_state : public driver_device diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h index bf9db73747b..e339f00cf39 100644 --- a/src/mame/includes/coco.h +++ b/src/mame/includes/coco.h @@ -23,7 +23,6 @@ #include "machine/ram.h" #include "machine/bankdev.h" #include "sound/dac.h" -#include "sound/wave.h" #include "screen.h" @@ -236,7 +235,6 @@ protected: required_device<pia6821_device> m_pia_1; required_device<dac_byte_interface> m_dac; required_device<dac_1bit_device> m_sbs; - required_device<wave_device> m_wave; optional_device<screen_device> m_screen; required_device<cococart_slot_device> m_cococart; required_device<ram_device> m_ram; diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h index a8b4dbca0e7..458128ebeaa 100644 --- a/src/mame/includes/comx35.h +++ b/src/mame/includes/comx35.h @@ -14,7 +14,6 @@ #include "machine/ram.h" #include "machine/rescap.h" #include "sound/cdp1869.h" -#include "sound/wave.h" #define SCREEN_TAG "screen" diff --git a/src/mame/includes/crvision.h b/src/mame/includes/crvision.h index c32b1670724..3574b66002f 100644 --- a/src/mame/includes/crvision.h +++ b/src/mame/includes/crvision.h @@ -13,7 +13,6 @@ #include "bus/crvision/rom.h" #include "machine/ram.h" #include "sound/sn76496.h" -#include "sound/wave.h" #include "video/tms9928a.h" #define SCREEN_TAG "screen" diff --git a/src/mame/includes/dai.h b/src/mame/includes/dai.h index d0f55b46e22..4bceae6060a 100644 --- a/src/mame/includes/dai.h +++ b/src/mame/includes/dai.h @@ -16,7 +16,6 @@ #include "machine/ram.h" #include "machine/tms5501.h" #include "imagedev/cassette.h" -#include "sound/wave.h" #include "emupal.h" diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h index d8ba4d0cd46..dc9469a6b7c 100644 --- a/src/mame/includes/kc.h +++ b/src/mame/includes/kc.h @@ -24,7 +24,6 @@ #include "machine/kc_keyb.h" #include "machine/rescap.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h index ca597ea221e..0aaa193cdcf 100644 --- a/src/mame/includes/mbee.h +++ b/src/mame/includes/mbee.h @@ -26,7 +26,6 @@ #include "machine/z80pio.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "video/mc6845.h" @@ -43,7 +42,6 @@ public: , m_maincpu(*this, "maincpu") , m_pio(*this, "z80pio") , m_cassette(*this, "cassette") - , m_wave(*this, "wave") , m_speaker(*this, "speaker") , m_centronics(*this, "centronics") , m_cent_data_out(*this, "cent_data_out") @@ -185,7 +183,6 @@ private: required_device<z80_device> m_maincpu; required_device<z80pio_device> m_pio; required_device<cassette_image_device> m_cassette; - required_device<wave_device> m_wave; required_device<speaker_sound_device> m_speaker; required_device<centronics_device> m_centronics; required_device<output_latch_device> m_cent_data_out; diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h index 41115a3d9e3..3554623932e 100644 --- a/src/mame/includes/msx.h +++ b/src/mame/includes/msx.h @@ -17,7 +17,6 @@ #include "bus/centronics/ctronics.h" #include "sound/ay8910.h" #include "sound/dac.h" -#include "sound/wave.h" #include "sound/ym2413.h" #include "video/v9938.h" #include "video/tms9928a.h" diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h index 9291111510a..7b022d2ca89 100644 --- a/src/mame/includes/mz80.h +++ b/src/mame/includes/mz80.h @@ -16,7 +16,6 @@ #include "machine/timer.h" #include "imagedev/cassette.h" #include "sound/spkrdev.h" -#include "sound/wave.h" class mz80_state : public driver_device { diff --git a/src/mame/includes/orion.h b/src/mame/includes/orion.h index 74252c5f6a5..0ec84fa7513 100644 --- a/src/mame/includes/orion.h +++ b/src/mame/includes/orion.h @@ -25,7 +25,6 @@ #include "sound/ay8910.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/includes/pc6001.h b/src/mame/includes/pc6001.h index 175ae918c71..74b6919f16c 100644 --- a/src/mame/includes/pc6001.h +++ b/src/mame/includes/pc6001.h @@ -14,7 +14,6 @@ #include "sound/ay8910.h" #include "sound/upd7752.h" //#include "sound/2203intf.h" -#include "sound/wave.h" #include "video/mc6847.h" #include "bus/generic/slot.h" diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h index 5bde580b59b..256c307c799 100644 --- a/src/mame/includes/phc25.h +++ b/src/mame/includes/phc25.h @@ -8,7 +8,6 @@ #include "cpu/z80/z80.h" #include "imagedev/cassette.h" -#include "sound/wave.h" #include "machine/ram.h" #include "bus/centronics/ctronics.h" #include "video/mc6847.h" diff --git a/src/mame/includes/pk8020.h b/src/mame/includes/pk8020.h index dd81db6fef7..e6f2c2eb6f4 100644 --- a/src/mame/includes/pk8020.h +++ b/src/mame/includes/pk8020.h @@ -20,7 +20,6 @@ #include "machine/ram.h" #include "machine/wd_fdc.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "emupal.h" diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h index e046c934412..7bea32d0f5b 100644 --- a/src/mame/includes/poly880.h +++ b/src/mame/includes/poly880.h @@ -13,7 +13,6 @@ #include "machine/z80ctc.h" #include "machine/ram.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "speaker.h" #define SCREEN_TAG "screen" diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h index dc034071611..8da1cd626fb 100644 --- a/src/mame/includes/pp01.h +++ b/src/mame/includes/pp01.h @@ -17,7 +17,6 @@ #include "machine/pit8253.h" #include "machine/i8255.h" #include "sound/spkrdev.h" -//#include "sound/wave.h" //#include "imagedev/cassette.h" #include "emupal.h" diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h index d8cec2111c3..3a3cb11fed1 100644 --- a/src/mame/includes/px8.h +++ b/src/mame/includes/px8.h @@ -12,7 +12,6 @@ #include "machine/ram.h" #include "machine/i8251.h" #include "bus/epson_sio/pf10.h" -#include "sound/wave.h" #include "emupal.h" #include "bus/generic/slot.h" diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h index 92ca3fda99a..fadee209edc 100644 --- a/src/mame/includes/sorcerer.h +++ b/src/mame/includes/sorcerer.h @@ -11,7 +11,6 @@ #pragma once #include "cpu/z80/z80.h" -#include "sound/wave.h" #include "machine/ay31015.h" #include "machine/clock.h" #include "bus/centronics/ctronics.h" @@ -52,8 +51,6 @@ public: , m_maincpu(*this, "maincpu") , m_cassette1(*this, "cassette") , m_cassette2(*this, "cassette2") - , m_wave1(*this, "wave") - , m_wave2(*this, "wave2") , m_uart(*this, "uart") , m_uart_clock(*this, "uart_clock") , m_rs232(*this, "rs232") @@ -121,8 +118,6 @@ private: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cassette1; required_device<cassette_image_device> m_cassette2; - required_device<wave_device> m_wave1; - required_device<wave_device> m_wave2; required_device<ay31015_device> m_uart; required_device<clock_device> m_uart_clock; required_device<rs232_port_device> m_rs232; diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h index c0b466829e9..835df33f4b5 100644 --- a/src/mame/includes/special.h +++ b/src/mame/includes/special.h @@ -15,7 +15,6 @@ #include "cpu/i8085/i8085.h" #include "audio/special.h" #include "sound/dac.h" -#include "sound/wave.h" #include "machine/i8255.h" #include "machine/pit8253.h" #include "imagedev/cassette.h" diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h index 75068b1f01d..c8bae09b8c6 100644 --- a/src/mame/includes/super80.h +++ b/src/mame/includes/super80.h @@ -18,7 +18,6 @@ #include "machine/z80pio.h" #include "sound/samples.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "video/mc6845.h" #include "emupal.h" #include "screen.h" @@ -44,7 +43,6 @@ public: , m_p_videoram(*this, "videoram") , m_pio(*this, "z80pio") , m_cassette(*this, "cassette") - , m_wave(*this, "wave") , m_samples(*this, "samples") , m_speaker(*this, "speaker") , m_centronics(*this, "centronics") @@ -143,7 +141,6 @@ private: optional_region_ptr<u8> m_p_videoram; required_device<z80pio_device> m_pio; required_device<cassette_image_device> m_cassette; - required_device<wave_device> m_wave; required_device<samples_device> m_samples; required_device<speaker_sound_device> m_speaker; required_device<centronics_device> m_centronics; diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 2ce657535ae..3b6d5249863 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -20,7 +20,6 @@ #include "machine/buffer.h" #include "machine/wd_fdc.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "emupal.h" #include "formats/trs_cas.h" diff --git a/src/mame/includes/trs80m3.h b/src/mame/includes/trs80m3.h index 4c4434e8339..5c982e73ff1 100644 --- a/src/mame/includes/trs80m3.h +++ b/src/mame/includes/trs80m3.h @@ -20,7 +20,6 @@ #include "machine/buffer.h" #include "machine/wd_fdc.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "emupal.h" #include "formats/trs_cas.h" diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h index 358cf993daa..e4dccb4b721 100644 --- a/src/mame/includes/ut88.h +++ b/src/mame/includes/ut88.h @@ -11,7 +11,6 @@ #include "cpu/i8085/i8085.h" #include "sound/dac.h" -#include "sound/wave.h" #include "machine/i8255.h" #include "imagedev/cassette.h" #include "emupal.h" diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h index b436892e739..5aff5a91ec6 100644 --- a/src/mame/includes/vc4000.h +++ b/src/mame/includes/vc4000.h @@ -15,7 +15,6 @@ #include "cpu/s2650/s2650.h" #include "imagedev/snapquik.h" #include "imagedev/cassette.h" -#include "sound/wave.h" #include "bus/vc4000/slot.h" #include "bus/vc4000/rom.h" diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h index f17d6d4b1bd..58f7377b010 100644 --- a/src/mame/includes/x07.h +++ b/src/mame/includes/x07.h @@ -15,7 +15,6 @@ #include "machine/nvram.h" #include "machine/ram.h" #include "machine/timer.h" -#include "sound/wave.h" #include "imagedev/cassette.h" #include "imagedev/printer.h" #include "formats/x07_cas.h" diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h index 70ad3474489..621133ac9b6 100644 --- a/src/mame/includes/x1.h +++ b/src/mame/includes/x1.h @@ -25,7 +25,6 @@ #include "machine/z80dart.h" #include "machine/z80dma.h" #include "sound/ay8910.h" -#include "sound/wave.h" #include "sound/ym2151.h" #include "video/mc6845.h" diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h index ab0161f9fc3..1ba1ffb6329 100644 --- a/src/mame/includes/zx.h +++ b/src/mame/includes/zx.h @@ -15,7 +15,6 @@ #include "imagedev/cassette.h" #include "machine/ram.h" #include "sound/spkrdev.h" -#include "sound/wave.h" #include "emupal.h" #include "screen.h" diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp index fb1569828b5..8bd56aec4e4 100644 --- a/src/mame/machine/coco.cpp +++ b/src/mame/machine/coco.cpp @@ -88,7 +88,6 @@ coco_state::coco_state(const machine_config &mconfig, device_type type, const ch m_pia_1(*this, PIA1_TAG), m_dac(*this, "dac"), m_sbs(*this, "sbs"), - m_wave(*this, "wave"), m_screen(*this, SCREEN_TAG), m_cococart(*this, CARTRIDGE_TAG), m_ram(*this, RAM_TAG), |