summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Robbbert <Robbbert@users.noreply.github.com>2019-07-06 01:37:31 +1000
committerGravatarGravatar Robbbert <Robbbert@users.noreply.github.com>2019-07-06 01:37:31 +1000
commit46261ff71b1c2fa64a9a97baac86439723f07dd7 (patch) (github)
treeca52715036013804f8f7e2103309468248f1883a
parente19acb87e33a69eff7a05f77008abcbe704b35ed (diff)
downloadmame-46261ff71b1c2fa64a9a97baac86439723f07dd7.tar.bz2
mame-46261ff71b1c2fa64a9a97baac86439723f07dd7.zip
(nw) get rid of wave.h usage part 1
-rw-r--r--src/mame/drivers/a5105.cpp3
-rw-r--r--src/mame/drivers/abc80x.cpp11
-rw-r--r--src/mame/drivers/ac1.cpp3
-rw-r--r--src/mame/drivers/acrnsys1.cpp3
-rw-r--r--src/mame/drivers/agat.cpp3
-rw-r--r--src/mame/drivers/alphatro.cpp3
-rw-r--r--src/mame/drivers/amstrad.cpp5
-rw-r--r--src/mame/drivers/apf.cpp4
-rw-r--r--src/mame/drivers/apogee.cpp5
-rw-r--r--src/mame/drivers/applix.cpp4
-rw-r--r--src/mame/drivers/aquarius.cpp3
-rw-r--r--src/mame/drivers/atom.cpp5
-rw-r--r--src/mame/drivers/bcs3.cpp17
-rw-r--r--src/mame/drivers/binbug.cpp6
-rw-r--r--src/mame/drivers/bk.cpp3
-rw-r--r--src/mame/drivers/bmjr.cpp3
-rw-r--r--src/mame/drivers/bml3.cpp11
-rw-r--r--src/mame/drivers/bob85.cpp7
-rw-r--r--src/mame/drivers/c80.cpp7
-rw-r--r--src/mame/drivers/camplynx.cpp4
-rw-r--r--src/mame/drivers/cd2650.cpp3
-rw-r--r--src/mame/drivers/cgenie.cpp3
-rw-r--r--src/mame/drivers/cosmicos.cpp3
-rw-r--r--src/mame/drivers/cp1.cpp6
-rw-r--r--src/mame/drivers/d6800.cpp3
-rw-r--r--src/mame/drivers/dolphunk.cpp3
-rw-r--r--src/mame/drivers/e100.cpp5
-rw-r--r--src/mame/drivers/elf.cpp6
-rw-r--r--src/mame/drivers/elwro800.cpp3
-rw-r--r--src/mame/drivers/emma2.cpp9
-rw-r--r--src/mame/drivers/ep64.cpp5
-rw-r--r--src/mame/drivers/et3400.cpp7
-rw-r--r--src/mame/drivers/eti660.cpp3
-rw-r--r--src/mame/drivers/excali64.cpp3
-rw-r--r--src/mame/drivers/exp85.cpp3
-rw-r--r--src/mame/drivers/fc100.cpp3
-rw-r--r--src/mame/drivers/fm7.cpp11
-rw-r--r--src/mame/drivers/fp1100.cpp3
-rw-r--r--src/mame/drivers/galaxy.cpp5
-rw-r--r--src/mame/drivers/h8.cpp3
-rw-r--r--src/mame/drivers/hec2hrp.cpp1
-rw-r--r--src/mame/drivers/homelab.cpp11
-rw-r--r--src/mame/drivers/huebler.cpp3
-rw-r--r--src/mame/drivers/instruct.cpp6
-rw-r--r--src/mame/drivers/interact.cpp1
-rw-r--r--src/mame/drivers/iq151.cpp3
-rw-r--r--src/mame/drivers/jr100.cpp3
-rw-r--r--src/mame/drivers/jtc.cpp11
-rw-r--r--src/mame/drivers/jupace.cpp3
-rw-r--r--src/mame/drivers/kim1.cpp7
-rw-r--r--src/mame/drivers/lola8a.cpp3
-rw-r--r--src/mame/drivers/lviv.cpp3
-rw-r--r--src/mame/drivers/m5.cpp3
-rw-r--r--src/mame/drivers/mc10.cpp5
-rw-r--r--src/mame/drivers/mc1000.cpp3
-rw-r--r--src/mame/drivers/mc1502.cpp3
-rw-r--r--src/mame/drivers/mekd2.cpp3
-rw-r--r--src/mame/drivers/meritum.cpp4
-rw-r--r--src/mame/drivers/microtan.cpp3
-rw-r--r--src/mame/drivers/mikro80.cpp3
-rw-r--r--src/mame/drivers/mikrosha.cpp3
-rw-r--r--src/mame/drivers/mk14.cpp3
-rw-r--r--src/mame/drivers/mkit09.cpp5
-rw-r--r--src/mame/drivers/mmd1.cpp6
-rw-r--r--src/mame/drivers/modellot.cpp3
-rw-r--r--src/mame/drivers/ms0515.cpp1
-rw-r--r--src/mame/drivers/mycom.cpp5
-rw-r--r--src/mame/drivers/mz2000.cpp11
-rw-r--r--src/mame/drivers/mz700.cpp3
-rw-r--r--src/mame/drivers/newbrain.cpp9
-rw-r--r--src/mame/drivers/ondra.cpp3
-rw-r--r--src/mame/drivers/orao.cpp3
-rw-r--r--src/mame/drivers/oric.cpp5
-rw-r--r--src/mame/drivers/osi.cpp7
-rw-r--r--src/mame/drivers/partner.cpp3
-rw-r--r--src/mame/drivers/pcm.cpp3
-rw-r--r--src/mame/drivers/pecom.cpp1
-rw-r--r--src/mame/drivers/pegasus.cpp3
-rw-r--r--src/mame/drivers/pencil2.cpp3
-rw-r--r--src/mame/drivers/phunsy.cpp4
-rw-r--r--src/mame/drivers/pk8000.cpp3
-rw-r--r--src/mame/drivers/pmd85.cpp3
-rw-r--r--src/mame/drivers/pmi80.cpp6
-rw-r--r--src/mame/drivers/poisk1.cpp15
-rw-r--r--src/mame/drivers/poly88.cpp3
-rw-r--r--src/mame/drivers/primo.cpp3
-rw-r--r--src/mame/drivers/pro80.cpp8
-rw-r--r--src/mame/drivers/proteus3.cpp6
-rw-r--r--src/mame/drivers/ptcsol.cpp5
-rw-r--r--src/mame/drivers/pv2000.cpp5
-rw-r--r--src/mame/drivers/px4.cpp3
-rw-r--r--src/mame/drivers/radio86.cpp3
-rw-r--r--src/mame/drivers/ravens.cpp11
-rw-r--r--src/mame/drivers/rc759.cpp11
-rw-r--r--src/mame/drivers/rm380z.cpp6
-rw-r--r--src/mame/drivers/rx78.cpp9
-rw-r--r--src/mame/drivers/samcoupe.cpp13
-rw-r--r--src/mame/drivers/shine.cpp3
-rw-r--r--src/mame/drivers/spc1000.cpp3
-rw-r--r--src/mame/drivers/spc1500.cpp5
-rw-r--r--src/mame/drivers/spectrum.cpp3
-rw-r--r--src/mame/drivers/svi318.cpp5
-rw-r--r--src/mame/drivers/tavernie.cpp3
-rw-r--r--src/mame/drivers/tec1.cpp5
-rw-r--r--src/mame/drivers/tiki100.cpp13
-rw-r--r--src/mame/drivers/tk2000.cpp3
-rw-r--r--src/mame/drivers/tmc2000e.cpp3
-rw-r--r--src/mame/drivers/vector06.cpp3
-rw-r--r--src/mame/drivers/vg5k.cpp3
-rw-r--r--src/mame/drivers/vtech1.cpp3
-rw-r--r--src/mame/drivers/vtech2.cpp3
-rw-r--r--src/mame/drivers/z1013.cpp3
-rw-r--r--src/mame/drivers/z80ne.cpp25
-rw-r--r--src/mame/drivers/z9001.cpp3
114 files changed, 229 insertions, 339 deletions
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index aebc4e32193..ec5bb1cf8ff 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -30,7 +30,6 @@ ToDo:
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "video/upd7220.h"
#include "emupal.h"
@@ -608,7 +607,6 @@ void a5105_state::a5105(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
BEEP(config, "beeper", 500).add_route(ALL_OUTPUTS, "mono", 0.50);
/* Devices */
@@ -628,6 +626,7 @@ void a5105_state::a5105(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
UPD765A(config, m_fdc, 8'000'000, true, true);
FLOPPY_CONNECTOR(config, "upd765a:0", a5105_floppies, "525qd", a5105_state::floppy_formats);
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index faf833ef32f..98a9da1c6d4 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -150,7 +150,6 @@ Notes:
#include "emu.h"
#include "includes/abc80x.h"
-#include "sound/wave.h"
#define LOG 0
@@ -1085,8 +1084,13 @@ void abc800_state::common(machine_config &config)
m_dart->out_txdb_callback().set(ABC_KEYBOARD_PORT_TAG, FUNC(abc_keyboard_port_device::txd_w));
m_dart->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ // sound hardware
+ SPEAKER(config, "mono").front_center();
+ DISCRETE(config, m_discrete, abc800_discrete).add_route(ALL_OUTPUTS, "mono", 0.80);
+
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);
TIMER(config, TIMER_CASSETTE_TAG).configure_periodic(FUNC(abc800_state::cassette_input_tick), attotime::from_hz(44100));
rs232_port_device &rs232a(RS232_PORT(config, RS232_A_TAG, default_rs232_devices, nullptr));
@@ -1106,11 +1110,6 @@ void abc800_state::common(machine_config &config)
ABCBUS_SLOT(config, ABCBUS_TAG, ABC800_X01/2/2, abcbus_cards, nullptr);
- // sound hardware
- SPEAKER(config, "mono").front_center();
- DISCRETE(config, m_discrete, abc800_discrete).add_route(ALL_OUTPUTS, "mono", 0.80);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
-
// software list
SOFTWARE_LIST(config, "flop_list").set_original("abc800");
SOFTWARE_LIST(config, "hdd_list").set_original("abc800_hdd");
diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp
index 0adcedff17a..d3af6fd4491 100644
--- a/src/mame/drivers/ac1.cpp
+++ b/src/mame/drivers/ac1.cpp
@@ -24,7 +24,6 @@
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "machine/z80pio.h"
-#include "sound/wave.h"
#include "screen.h"
#include "speaker.h"
@@ -156,10 +155,10 @@ void ac1_state::ac1(machine_config &config)
PALETTE(config, m_palette, palette_device::MONOCHROME);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
}
void ac1_state::ac1_32(machine_config &config)
diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp
index 726a4e26cab..d910b85414f 100644
--- a/src/mame/drivers/acrnsys1.cpp
+++ b/src/mame/drivers/acrnsys1.cpp
@@ -52,7 +52,6 @@ Note that left-most digit is not wired up, and therefore will always be blank.
#include "machine/74145.h"
#include "machine/timer.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "acrnsys1.lh"
@@ -274,7 +273,6 @@ void acrnsys1_state::acrnsys1(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
/* devices */
ins8154_device &b1(INS8154(config, "b1"));
@@ -286,6 +284,7 @@ void acrnsys1_state::acrnsys1(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(acrnsys1_state::kansas_w), attotime::from_hz(4800));
TIMER(config, "kansas_r").configure_periodic(FUNC(acrnsys1_state::kansas_r), attotime::from_hz(40000));
diff --git a/src/mame/drivers/agat.cpp b/src/mame/drivers/agat.cpp
index 0ca770fd1b4..ee5715ca6bd 100644
--- a/src/mame/drivers/agat.cpp
+++ b/src/mame/drivers/agat.cpp
@@ -80,7 +80,6 @@
#include "machine/bankdev.h"
#include "machine/kb3600.h"
#include "machine/timer.h"
-#include "sound/wave.h"
#include "sound/spkrdev.h"
#include "bus/a2bus/a2diskii.h"
@@ -1495,7 +1494,6 @@ void agat7_state::agat7(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);
/* /INH banking */
ADDRESS_MAP_BANK(config, m_upperbank).set_map(&agat7_state::inhbank_map).set_options(ENDIANNESS_LITTLE, 8, 32, 0x3000);
@@ -1538,6 +1536,7 @@ void agat7_state::agat7(machine_config &config)
CASSETTE(config,m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
}
void agat9_state::agat9(machine_config &config)
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index b0d1726fab9..ccd92fdb623 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -39,7 +39,6 @@
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
#include "screen.h"
@@ -749,7 +748,6 @@ void alphatro_state::alphatro(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
BEEP(config, "beeper", 16_MHz_XTAL / 4 / 13 / 128).add_route(ALL_OUTPUTS, "mono", 1.00); // nominally 2.4 kHz
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
/* Devices */
UPD765A(config, m_fdc, 16_MHz_XTAL / 2, true, true); // clocked through SED-9420C
@@ -782,6 +780,7 @@ void alphatro_state::alphatro(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cass->set_interface("alphatro_cass");
SOFTWARE_LIST(config, "cass_list").set_original("alphatro_cass");
diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp
index f8f7ddc89ef..b346a125a5d 100644
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@@ -98,7 +98,6 @@ Some bugs left :
#include "video/mc6845.h" /* CRTC */
#include "machine/upd765.h" /* for floppy disc controller */
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "machine/mc146818.h" /* Aleste RTC */
#include "bus/centronics/ctronics.h"
@@ -945,7 +944,6 @@ void amstrad_state::amstrad_base(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25);
AY8912(config, m_ay, 16_MHz_XTAL / 16);
m_ay->port_a_read_callback().set(FUNC(amstrad_state::amstrad_psg_porta_read));
m_ay->add_route(ALL_OUTPUTS, "mono", 0.25);
@@ -960,6 +958,7 @@ void amstrad_state::amstrad_base(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(cdt_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.10);
m_cassette->set_interface("cpc_cass");
SOFTWARE_LIST(config, "cass_list").set_original("cpc_cass");
@@ -1070,7 +1069,6 @@ void amstrad_state::cpcplus(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.25);
AY8912(config, m_ay, 40_MHz_XTAL / 40);
m_ay->port_a_read_callback().set(FUNC(amstrad_state::amstrad_psg_porta_read));
m_ay->add_route(ALL_OUTPUTS, "mono", 0.25);
@@ -1085,6 +1083,7 @@ void amstrad_state::cpcplus(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(cdt_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.10);
m_cassette->set_interface("cpc_cass");
SOFTWARE_LIST(config, "cass_list").set_original("cpc_cass");
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 8d1bed1ec81..880d9ec19ce 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -78,7 +78,6 @@ ToDo:
#include "machine/ram.h"
#include "machine/wd_fdc.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/mc6847.h"
#include "bus/apf/slot.h"
@@ -563,8 +562,6 @@ void apf_state::apfimag(machine_config &config)
/* internal ram */
RAM(config, RAM_TAG).set_default_size("8K").set_extra_options("16K");
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.15);
-
PIA6821(config, m_pia1, 0);
m_pia1->readpa_handler().set(FUNC(apf_state::pia1_porta_r));
m_pia1->readpb_handler().set(FUNC(apf_state::pia1_portb_r));
@@ -573,6 +570,7 @@ void apf_state::apfimag(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_formats(apf_cassette_formats);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.15);
m_cass->set_interface("apf_cass");
FD1771(config, m_fdc, 1000000); // guess
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index e603ce12142..9518192e2cb 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -17,7 +17,6 @@
#include "machine/i8255.h"
#include "machine/pit8253.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -253,7 +252,6 @@ void apogee_state::apogee(machine_config &config)
PALETTE(config, m_palette, FUNC(apogee_state::radio86_palette), 3);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
SPEAKER_SOUND(config, m_speaker);
m_speaker->set_levels(4, speaker_levels);
m_speaker->add_route(ALL_OUTPUTS, "mono", 0.75);
@@ -266,8 +264,9 @@ void apogee_state::apogee(machine_config &config)
m_dma8257->set_reverse_rw_mode(1);
CASSETTE(config, m_cassette);
- m_cassette->set_formats(rka_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->set_formats(rka_cassette_formats);
m_cassette->set_interface("apogee_cass");
SOFTWARE_LIST(config, "cass_list").set_original("apogee");
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index 6fc1928317b..b05d1abe1d2 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -48,7 +48,6 @@
#include "machine/z80scc.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
@@ -892,8 +891,6 @@ void applix_state::applix(machine_config &config)
vref.add_route(0, "ldac", 1.0, DAC_VREF_POS_INPUT).add_route(0, "ldac", -1.0, DAC_VREF_NEG_INPUT);
vref.add_route(0, "rdac", 1.0, DAC_VREF_POS_INPUT).add_route(0, "rdac", -1.0, DAC_VREF_NEG_INPUT);
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "lspeaker", 0.10);
-
/* Devices */
MC6845(config, m_crtc, 30_MHz_XTAL / 16); // MC6545 @ 1.875 MHz
m_crtc->set_screen("screen");
@@ -921,6 +918,7 @@ void applix_state::applix(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "lspeaker", 0.10);
WD1772(config, m_fdc, 16_MHz_XTAL / 2); //connected to Z80H clock pin
FLOPPY_CONNECTOR(config, "fdc:0", applix_floppies, "35dd", applix_state::floppy_formats).enable_sound(true);
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index a9183807c1b..f0912c2cd3f 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -24,7 +24,6 @@
#include "emu.h"
#include "includes/aquarius.h"
-#include "sound/wave.h"
#include "softlist.h"
#include "speaker.h"
@@ -374,7 +373,6 @@ void aquarius_state::aquarius(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.25);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
ay8910_device &ay8910(AY8910(config, "ay8910", XTAL(3'579'545)/2)); // ??? AY-3-8914
ay8910.port_a_read_callback().set_ioport("RIGHT");
@@ -384,6 +382,7 @@ void aquarius_state::aquarius(machine_config &config)
/* cassette */
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);
/* cartridge */
GENERIC_CARTSLOT(config, m_cart, generic_linear_slot, "aquarius_cart");
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index d3d8fccb1b5..b223762feb8 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -115,7 +115,6 @@ Hardware: PPIA 8255
#include "emu.h"
#include "includes/atom.h"
#include "formats/imageutl.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
#include "speaker.h"
@@ -725,7 +724,6 @@ void atom_state::atom(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);
/* devices */
TIMER(config, "hz2400").configure_periodic(FUNC(atom_state::cassette_output_tick), attotime::from_hz(4806));
@@ -755,8 +753,9 @@ void atom_state::atom(machine_config &config)
m_centronics->set_output_latch(cent_data_out);
CASSETTE(config, m_cassette);
- m_cassette->set_formats(atom_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->set_formats(atom_cassette_formats);
m_cassette->set_interface("atom_cass");
QUICKLOAD(config, "quickload", "atm").set_load_callback(FUNC(atom_state::quickload_cb), this);
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index dcfecd744a8..730c5250463 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -85,7 +85,6 @@ To Do:
#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -455,12 +454,12 @@ void bcs3_state::bcs3a(machine_config &config)
m_screen->set_visarea(0, 29*8-1, 0, 12*10-1);
m_screen->set_screen_update(FUNC(bcs3_state::screen_update_bcs3a));
- CASSETTE(config, m_cass);
- m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
+
+ CASSETTE(config, m_cass);
+ m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
void bcs3_state::bcs3b(machine_config &config)
@@ -487,12 +486,12 @@ void bcs3_state::bcs3b(machine_config &config)
m_ctc->zc_callback<0>().set(FUNC(bcs3_state::ctc_z0_w));
m_ctc->zc_callback<1>().set(FUNC(bcs3_state::ctc_z1_w));
- CASSETTE(config, m_cass);
- m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
+
+ CASSETTE(config, m_cass);
+ m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index f6f77039f5a..ead8f633081 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -60,7 +60,6 @@
#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -315,11 +314,12 @@ void binbug_state::binbug_base(machine_config &config)
GFXDECODE(config, "gfxdecode", "palette", gfx_dg640);
PALETTE(config, "palette", palette_device::MONOCHROME);
+ SPEAKER(config, "mono").front_center();
+
/* Cassette */
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
void binbug_state::binbug(machine_config &config)
diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp
index 822ad184c8d..1990e6d0dff 100644
--- a/src/mame/drivers/bk.cpp
+++ b/src/mame/drivers/bk.cpp
@@ -12,7 +12,6 @@
#include "emu.h"
#include "includes/bk.h"
-#include "sound/wave.h"
#include "formats/rk_cas.h"
#include "emupal.h"
@@ -184,10 +183,10 @@ void bk_state::bk0010(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("bk0010_cass");
SOFTWARE_LIST(config, "cass_list").set_original("bk0010");
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index a1bee2628d3..23112b137f1 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -18,7 +18,6 @@
#include "cpu/m6800/m6800.h"
#include "imagedev/cassette.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -360,10 +359,10 @@ void bmjr_state::bmjr(machine_config &config)
/* Audio */
SPEAKER(config, "mono").front_center();
BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50); // guesswork
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25);
/* Devices */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp
index dd82b412622..765e87dbc44 100644
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@@ -23,7 +23,6 @@
#include "machine/timer.h"
#include "sound/2203intf.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
@@ -953,17 +952,17 @@ void bml3_state::bml3_common(machine_config &config)
m_acia->rts_handler().set(FUNC(bml3_state::acia_rts_w));
m_acia->irq_handler().set(FUNC(bml3_state::acia_irq_w));
+ /* Audio */
+ SPEAKER(config, "mono").front_center();
+ SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50);
+
clock_device &acia_clock(CLOCK(config, "acia_clock", 9'600)); // 600 baud x 16(divider) = 9600
acia_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc));
acia_clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc));
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-
- /* 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);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
/* slot devices */
bml3bus_device &bus(BML3BUS(config, "bml3bus", 0));
diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp
index 7ab322a8c07..59d3b0ebeb4 100644
--- a/src/mame/drivers/bob85.cpp
+++ b/src/mame/drivers/bob85.cpp
@@ -24,7 +24,6 @@ Test Paste:
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "bob85.lh"
@@ -213,11 +212,11 @@ void bob85_state::bob85(machine_config &config)
/* video hardware */
config.set_default_layout(layout_bob85);
+ SPEAKER(config, "mono").front_center();
+
// devices
CASSETTE(config, m_cass).set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
-
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp
index db470acd0b3..ea2924cfe28 100644
--- a/src/mame/drivers/c80.cpp
+++ b/src/mame/drivers/c80.cpp
@@ -55,7 +55,6 @@ data of next byte, and so on.
#include "emu.h"
#include "includes/c80.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "c80.lh"
@@ -276,11 +275,11 @@ void c80_state::c80(machine_config &config)
z80pio_device& pio2(Z80PIO(config, Z80PIO2_TAG, XTAL(2500000)));
pio2.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
-
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
+ 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/camplynx.cpp b/src/mame/drivers/camplynx.cpp
index 4252753af13..68fbeb949e6 100644
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@@ -165,7 +165,6 @@
#include "machine/wd_fdc.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
@@ -857,7 +856,6 @@ void camplynx_state::lynx_common(machine_config &config)
SPEAKER(config, "speaker").front_center();
DAC_6BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.375); // unknown DAC
VOLTAGE_REGULATOR(config, "vref").add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT).add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "speaker", 0.02);
}
void camplynx_state::lynx_disk(machine_config &config)
@@ -889,6 +887,7 @@ void camplynx_state::lynx48k(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_formats(lynx48k_cassette_formats);
m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED);
+ m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
m_cass->set_interface("camplynx_cass");
/* devices */
@@ -937,6 +936,7 @@ void camplynx_state::lynx128k(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_formats(lynx128k_cassette_formats);
m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED);
+ m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
m_cass->set_interface("camplynx_cass");
/* devices */
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index b1d337e9fb5..b36edb1d821 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -57,7 +57,6 @@ TODO
#include "machine/keyboard.h"
#include "machine/timer.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -346,7 +345,6 @@ void cd2650_state::cd2650(machine_config &config)
/* Sound */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.15);
BEEP(config, "beeper", 950).add_route(ALL_OUTPUTS, "mono", 0.50); // guess
/* Devices */
@@ -354,6 +352,7 @@ void cd2650_state::cd2650(machine_config &config)
keyboard.set_keyboard_callback(FUNC(cd2650_state::kbd_put));
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.15);
TIMER(config, "kansas_w").configure_periodic(FUNC(cd2650_state::kansas_w), attotime::from_hz(4800));
TIMER(config, "kansas_r").configure_periodic(FUNC(cd2650_state::kansas_r), attotime::from_hz(40000));
}
diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp
index dc37b65cb54..0594ff04cf8 100644
--- a/src/mame/drivers/cgenie.cpp
+++ b/src/mame/drivers/cgenie.cpp
@@ -17,7 +17,6 @@
#include "machine/ram.h"
#include "video/mc6845.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "imagedev/cassette.h"
#include "formats/cgen_cas.h"
#include "bus/rs232/rs232.h"
@@ -462,11 +461,11 @@ void cgenie_state::cgenie(machine_config &config)
ay8910.port_b_read_callback().set("par", FUNC(cg_parallel_slot_device::pb_r));
ay8910.port_b_write_callback().set("par", FUNC(cg_parallel_slot_device::pb_w));
ay8910.add_route(ALL_OUTPUTS, "mono", 0.75);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
CASSETTE(config, m_cassette);
m_cassette->set_formats(cgenie_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("cgenie_cass");
SOFTWARE_LIST(config, "cass_list").set_original("cgenie_cass");
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index 095a679193e..e8b470cb272 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -42,7 +42,6 @@
#include "screen.h"
#include "speaker.h"
-#include "sound/wave.h"
#include "cosmicos.lh"
@@ -537,7 +536,6 @@ void cosmicos_state::cosmicos(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.25);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
CDP1864(config, m_cti, 1.75_MHz_XTAL).set_screen(SCREEN_TAG);
m_cti->inlace_cb().set_constant(0);
@@ -554,6 +552,7 @@ void cosmicos_state::cosmicos(machine_config &config)
QUICKLOAD(config, "quickload", "bin").set_load_callback(FUNC(cosmicos_state::quickload_cb), this);
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("256").set_extra_options("4K,48K");
diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp
index 93ea49cf299..b4bb54d20f4 100644
--- a/src/mame/drivers/cp1.cpp
+++ b/src/mame/drivers/cp1.cpp
@@ -17,7 +17,6 @@
#include "machine/i8155.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "cp1.lh"
@@ -289,10 +288,11 @@ void cp1_state::cp1(machine_config &config)
config.set_default_layout(layout_cp1);
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.50);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
QUICKLOAD(config, "quickload", "obj", attotime::from_seconds(1)).set_load_callback(FUNC(cp1_state::quickload_cb), this);
}
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp
index cc13bce5314..8459d0d4472 100644
--- a/src/mame/drivers/d6800.cpp
+++ b/src/mame/drivers/d6800.cpp
@@ -51,7 +51,6 @@
#include "machine/6821pia.h"
#include "machine/timer.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -426,7 +425,6 @@ void d6800_state::d6800(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50);
/* devices */
@@ -441,6 +439,7 @@ void d6800_state::d6800(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(d6800_state::kansas_w), attotime::from_hz(4800));
TIMER(config, "kansas_r").configure_periodic(FUNC(d6800_state::kansas_r), attotime::from_hz(40000));
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index 1478438257c..f6b6140985b 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -85,7 +85,6 @@
#include "imagedev/cassette.h"
#include "machine/timer.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "dolphunk.lh"
@@ -242,10 +241,10 @@ void dauphin_state::dauphin(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_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
/* cassette */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(dauphin_state::kansas_w), attotime::from_hz(4000));
}
diff --git a/src/mame/drivers/e100.cpp b/src/mame/drivers/e100.cpp
index c88c841c1ec..39e5d0c617d 100644
--- a/src/mame/drivers/e100.cpp
+++ b/src/mame/drivers/e100.cpp
@@ -37,7 +37,6 @@
// Features
#include "imagedev/cassette.h"
#include "bus/rs232/rs232.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "emupal.h"
#include "screen.h"
@@ -580,6 +579,7 @@ void e100_state::e100(machine_config &config)
/* Serial port support */
RS232_PORT(config, m_rs232, default_rs232_devices, nullptr);
+ SPEAKER(config, "mono").front_center();
/* Cassette support - E100 uses 300 baud Kansas City Standard with 1200/2400 Hz modulation */
/* NOTE on usage: mame e100 -window -cass <wav file> -ui_active
* Once running enable/disable internal UI by pressing Scroll Lock in case it interferes with target keys
@@ -590,8 +590,7 @@ void e100_state::e100(machine_config &config)
*/
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* screen TODO: simplify the screen config, look at zx.cpp */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp
index 6d613f679c0..96f23c68044 100644
--- a/src/mame/drivers/elf.cpp
+++ b/src/mame/drivers/elf.cpp
@@ -17,7 +17,6 @@
#include "emu.h"
#include "includes/elf.h"
#include "screen.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "elf2.lh"
@@ -274,10 +273,11 @@ void elf2_state::elf2(machine_config &config)
DM9368(config, m_led_h, 0).update_cb().set(FUNC(elf2_state::digit_w<0>));
DM9368(config, m_led_l, 0).update_cb().set(FUNC(elf2_state::digit_w<1>));
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
QUICKLOAD(config, "quickload", "bin").set_load_callback(FUNC(elf2_state::quickload_cb), this);
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index bef9f1cb84f..6c3543a9c77 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -21,7 +21,6 @@
#include "cpu/z80/z80.h"
#include "machine/upd765.h" /* for floppy disc controller */
#include "machine/i8255.h"
-#include "sound/wave.h"
#include "bus/centronics/ctronics.h"
#include "machine/i8251.h"
@@ -606,12 +605,12 @@ void elwro800_state::elwro800(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);
CASSETTE(config, m_cassette);
m_cassette->set_formats(tzx_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
FLOPPY_CONNECTOR(config, "upd765:0", elwro800jr_floppies, "525hd", floppy_image_device::default_floppy_formats);
FLOPPY_CONNECTOR(config, "upd765:1", elwro800jr_floppies, "525hd", floppy_image_device::default_floppy_formats);
diff --git a/src/mame/drivers/emma2.cpp b/src/mame/drivers/emma2.cpp
index 1c83b0c1d64..5741041f8e8 100644
--- a/src/mame/drivers/emma2.cpp
+++ b/src/mame/drivers/emma2.cpp
@@ -51,7 +51,6 @@ To Do:
#include "machine/6522via.h"
#include "machine/6821pia.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "emma2.lh"
@@ -212,13 +211,13 @@ void emma2_state::emma2(machine_config &config)
m_pia->irqa_handler().set_inputline(m_maincpu, m6502_device::IRQ_LINE);
m_pia->irqb_handler().set_inputline(m_maincpu, m6502_device::IRQ_LINE);
+ /* sound hardware */
+ SPEAKER(config, "mono").front_center();
+
/* cassette */
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
-
- /* sound hardware */
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
}
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index bc0e13ea6a0..f16b62b3cb2 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -161,7 +161,6 @@ Notes: (All IC's shown)
#include "machine/ram.h"
#include "sound/dave.h"
#include "video/nick.h"
-#include "sound/wave.h"
#include "softlist.h"
#include "speaker.h"
@@ -601,8 +600,6 @@ void ep64_state::ep64(machine_config &config)
m_dave->irq_wr().set_inputline(Z80_TAG, INPUT_LINE_IRQ0);
m_dave->add_route(0, "lspeaker", 0.25);
m_dave->add_route(1, "rspeaker", 0.25);
- WAVE(config, "wave1", m_cassette1).add_route(ALL_OUTPUTS, "lspeaker", 0.05);
- WAVE(config, "wave2", m_cassette2).add_route(ALL_OUTPUTS, "rspeaker", 0.05);
// devices
EP64_EXPANSION_BUS_SLOT(config, m_exp, nullptr);
@@ -623,10 +620,12 @@ void ep64_state::ep64(machine_config &config)
CASSETTE(config, m_cassette1);
m_cassette1->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
m_cassette1->set_interface("ep64_cass");
+ m_cassette1->add_route(ALL_OUTPUTS, "lspeaker", 0.05);
CASSETTE(config, m_cassette2);
m_cassette2->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
m_cassette2->set_interface("ep64_cass");
+ m_cassette2->add_route(ALL_OUTPUTS, "rspeaker", 0.05);
// internal RAM
RAM(config, m_ram).set_default_size("64K");
diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp
index e42a4b41111..6cf98f4d71a 100644
--- a/src/mame/drivers/et3400.cpp
+++ b/src/mame/drivers/et3400.cpp
@@ -29,7 +29,6 @@ ETA-3400 Memory I/O Accessory
#include "machine/6821pia.h"
#include "bus/rs232/rs232.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "et3400.lh"
@@ -240,7 +239,6 @@ void et3400_state::et3400(machine_config &config)
for (std::size_t i = 0; i < 6; i++)
LS259(config, m_displatch[i]);
-
m_displatch[0]->parallel_out_cb().set(FUNC(et3400_state::led_w<1>));
m_displatch[1]->parallel_out_cb().set(FUNC(et3400_state::led_w<2>));
m_displatch[2]->parallel_out_cb().set(FUNC(et3400_state::led_w<3>));
@@ -248,10 +246,11 @@ void et3400_state::et3400(machine_config &config)
m_displatch[4]->parallel_out_cb().set(FUNC(et3400_state::led_w<5>));
m_displatch[5]->parallel_out_cb().set(FUNC(et3400_state::led_w<6>));
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index 9f39600f668..8b85ead5f89 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -37,7 +37,6 @@
#include "emu.h"
#include "includes/eti660.h"
-#include "sound/wave.h"
#include "screen.h"
#include "speaker.h"
@@ -331,7 +330,7 @@ void eti660_state::eti660(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* internal ram */
RAM(config, RAM_TAG).set_default_size("3K");
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index 8779ce79392..51626c0bc56 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -44,7 +44,6 @@ ToDo:
#include "machine/wd_fdc.h"
#include "machine/z80dma.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
@@ -580,7 +579,6 @@ void excali64_state::excali64(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);
/* Video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -603,6 +601,7 @@ void excali64_state::excali64(machine_config &config)
/* Devices */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
WD2793(config, m_fdc, 16_MHz_XTAL / 16);
m_fdc->drq_wr_callback().set(m_dma, FUNC(z80dma_device::rdy_w));
diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp
index bec5d1c83eb..18abb29a2a3 100644
--- a/src/mame/drivers/exp85.cpp
+++ b/src/mame/drivers/exp85.cpp
@@ -35,7 +35,6 @@
#include "machine/i8155.h"
#include "machine/i8355.h"
#include "machine/ram.h"
-#include "sound/wave.h"
#include "speaker.h"
/* Memory Maps */
@@ -202,7 +201,7 @@ void exp85_state::exp85(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
RS232_PORT(config, "rs232", default_rs232_devices, "terminal").set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal));
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index 6e75f882974..93a6a63be50 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -43,7 +43,6 @@ TODO:
#include "machine/i8251.h"
#include "machine/timer.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "video/mc6847.h"
#include "emupal.h"
@@ -531,7 +530,6 @@ void fc100_state::fc100(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
ay8910_device &psg(AY8910(config, "psg", XTAL(7'159'090)/3/2)); /* AY-3-8910 - clock not verified */
psg.port_a_read_callback().set_ioport("JOY0");
psg.port_b_read_callback().set_ioport("JOY1");
@@ -543,6 +541,7 @@ void fc100_state::fc100(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_formats(fc100_cassette_formats);
m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
I8251(config, m_uart, 0);
m_uart->txd_handler().set([this] (bool state) { m_cassbit = state; });
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index 0d9c714c16a..ca6703e6b8a 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -46,7 +46,6 @@
#include "sound/ay8910.h"
#include "sound/2203intf.h"
-#include "sound/wave.h"
#include "sound/beep.h"
#include "bus/centronics/dsjoy.h"
@@ -2047,7 +2046,6 @@ void fm7_state::fm7(machine_config &config)
SPEAKER(config, "mono").front_center();
AY8910(config, m_psg, 4.9152_MHz_XTAL / 4).add_route(ALL_OUTPUTS,"mono", 1.00);
BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm7)
@@ -2061,6 +2059,7 @@ void fm7_state::fm7(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(fm7_cassette_formats);
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("fm7_cass");
SOFTWARE_LIST(config, "cass_list").set_original("fm7_cass");
@@ -2100,7 +2099,6 @@ void fm7_state::fm8(machine_config &config)
SPEAKER(config, "mono").front_center();
BEEP(config, m_beeper, 1200).add_route(ALL_OUTPUTS, "mono", 0.50);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm7)
@@ -2114,6 +2112,7 @@ void fm7_state::fm8(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(fm7_cassette_formats);
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("fm7_cass");
MB8877(config, m_fdc, 8_MHz_XTAL / 8);
@@ -2153,7 +2152,6 @@ void fm7_state::fm77av(machine_config &config)
m_ym->port_b_read_callback().set(FUNC(fm7_state::fm77av_joy_2_r));
m_ym->add_route(ALL_OUTPUTS,"mono", 1.00);
BEEP(config, "beeper", 1200).add_route(ALL_OUTPUTS, "mono", 0.50);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm77av)
@@ -2173,6 +2171,7 @@ void fm7_state::fm77av(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(fm7_cassette_formats);
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("fm7_cass");
SOFTWARE_LIST(config, "cass_list").set_compatible("fm7_cass");
@@ -2216,7 +2215,6 @@ void fm7_state::fm11(machine_config &config)
SPEAKER(config, "mono").front_center();
BEEP(config, m_beeper, 1200).add_route(ALL_OUTPUTS, "mono", 0.50);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm11)
@@ -2235,6 +2233,7 @@ void fm7_state::fm11(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(fm7_cassette_formats);
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("fm7_cass");
MB8877(config, m_fdc, 8_MHz_XTAL / 8);
@@ -2269,7 +2268,6 @@ void fm7_state::fm16beta(machine_config &config)
SPEAKER(config, "mono").front_center();
BEEP(config, m_beeper, 1200).add_route(ALL_OUTPUTS, "mono", 0.50);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
MCFG_MACHINE_START_OVERRIDE(fm7_state,fm16)
@@ -2283,6 +2281,7 @@ void fm7_state::fm16beta(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(fm7_cassette_formats);
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("fm7_cass");
MB8877(config, m_fdc, 8_MHz_XTAL / 8);
diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp
index e23ae5a3387..5ae43e54d2a 100644
--- a/src/mame/drivers/fp1100.cpp
+++ b/src/mame/drivers/fp1100.cpp
@@ -45,7 +45,6 @@
#include "sound/beep.h"
#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -682,7 +681,7 @@ void fp1100_state::fp1100(machine_config &config)
/* Cassette */
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(fp1100_state::kansas_w), attotime::from_hz(4800)); // cass write
}
diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp
index 01a0b41274b..aedf7042191 100644
--- a/src/mame/drivers/galaxy.cpp
+++ b/src/mame/drivers/galaxy.cpp
@@ -32,7 +32,6 @@ Galaksija driver by Krzysztof Strzecha and Miodrag Milanovic
#include "imagedev/snapquik.h"
#include "machine/ram.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "softlist.h"
@@ -201,11 +200,11 @@ void galaxy_state::galaxy(machine_config &config)
SNAPSHOT(config, "snapshot", "gal").set_load_callback(FUNC(galaxy_state::snapshot_cb), this);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
CASSETTE(config, m_cassette);
m_cassette->set_formats(gtp_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("galaxy_cass");
SOFTWARE_LIST(config, "cass_list").set_original("galaxy");
@@ -242,11 +241,11 @@ void galaxy_state::galaxyp(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
AY8910(config, "ay8910", XTAL/4); // FIXME: really no output routes for this AY?
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
CASSETTE(config, m_cassette);
m_cassette->set_formats(gtp_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("galaxy_cass");
SOFTWARE_LIST(config, "cass_list").set_original("galaxy");
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index 6ee5a41a99c..6cf20f76be1 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -52,7 +52,6 @@ Official test program from pages 4 to 8 of the operator's manual:
#include "machine/timer.h"
#include "imagedev/cassette.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "h8.lh"
@@ -334,7 +333,6 @@ void h8_state::h8(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
BEEP(config, m_beep, H8_BEEP_FRQ).add_route(ALL_OUTPUTS, "mono", 1.00);
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
/* Devices */
I8251(config, m_uart, 0);
@@ -346,6 +344,7 @@ void h8_state::h8(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cass->set_interface("h8_cass");
TIMER(config, "kansas_w").configure_periodic(FUNC(h8_state::kansas_w), attotime::from_hz(4800));
diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp
index d1697dd1984..8de75c1a7d2 100644
--- a/src/mame/drivers/hec2hrp.cpp
+++ b/src/mame/drivers/hec2hrp.cpp
@@ -78,7 +78,6 @@
#include "imagedev/cassette.h"
#include "imagedev/printer.h"
#include "sound/discrete.h" /* for 1 Bit sound*/
-#include "sound/wave.h" /* for K7 sound*/
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp
index cb7b5a5c15b..dbbc6f6bec5 100644
--- a/src/mame/drivers/homelab.cpp
+++ b/src/mame/drivers/homelab.cpp
@@ -39,7 +39,6 @@ MB7051 - fuse programmed prom.
#include "sound/dac.h"
#include "sound/mea8000.h"
#include "sound/volt_reg.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -777,9 +776,9 @@ void homelab_state::homelab(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_cass).add_route(ALL_OUTPUTS, "speaker", 0.05);
-
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
+
QUICKLOAD(config, "quickload", "htp", attotime::from_seconds(2)).set_load_callback(FUNC(homelab_state::quickload_cb), this);
}
@@ -811,9 +810,8 @@ void homelab_state::homelab3(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_cass).add_route(ALL_OUTPUTS, "speaker", 0.05);
-
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
QUICKLOAD(config, "quickload", "htp", attotime::from_seconds(2)).set_load_callback(FUNC(homelab_state::quickload_cb), this);
}
@@ -845,11 +843,10 @@ void homelab_state::brailab4(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_cass).add_route(ALL_OUTPUTS, "speaker", 0.05);
-
MEA8000(config, "mea8000", 3840000).add_route(ALL_OUTPUTS, "speaker", 1.0);
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
QUICKLOAD(config, "quickload", "htp", attotime::from_seconds(18)).set_load_callback(FUNC(homelab_state::quickload_cb), this);
}
diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp
index 3608530c423..4fb261d8fcd 100644
--- a/src/mame/drivers/huebler.cpp
+++ b/src/mame/drivers/huebler.cpp
@@ -37,7 +37,6 @@ Cassette considerations
#include "emu.h"
#include "includes/huebler.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "screen.h"
@@ -365,7 +364,6 @@ void amu880_state::amu880(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
/* devices */
z80ctc_device& ctc(Z80CTC(config, Z80CTC_TAG, XTAL(10'000'000)/4));
@@ -386,6 +384,7 @@ void amu880_state::amu880(machine_config &config)
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("64K");
diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp
index 8a4b74a8c79..07eb2509694 100644
--- a/src/mame/drivers/instruct.cpp
+++ b/src/mame/drivers/instruct.cpp
@@ -47,7 +47,6 @@
#include "cpu/s2650/s2650.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "instruct.lh"
@@ -438,10 +437,11 @@ void instruct_state::instruct(machine_config &config)
/* quickload */
QUICKLOAD(config, "quickload", "pgm", attotime::from_seconds(1)).set_load_callback(FUNC(instruct_state::quickload_cb), this);
+ SPEAKER(config, "mono").front_center();
+
/* cassette */
CASSETTE(config, m_cass);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp
index 296dc89b3e0..7254e6b8e81 100644
--- a/src/mame/drivers/interact.cpp
+++ b/src/mame/drivers/interact.cpp
@@ -60,7 +60,6 @@
#include "imagedev/printer.h"
#include "machine/upd765.h" /* for floppy disc controller */
#include "sound/discrete.h" /* for 1 Bit sound*/
-#include "sound/wave.h" /* for K7 sound*/
#include "screen.h"
#include "softlist.h"
diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp
index c4b882d4f43..21e39460884 100644
--- a/src/mame/drivers/iq151.cpp
+++ b/src/mame/drivers/iq151.cpp
@@ -51,7 +51,6 @@ ToDo:
#include "machine/pic8259.h"
#include "machine/timer.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
// cartridge slot
#include "bus/iq151/iq151.h"
@@ -412,7 +411,6 @@ void iq151_state::iq151(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
PIC8259(config, m_pic, 0);
m_pic->out_int_callback().set_inputline(m_maincpu, 0);
@@ -425,6 +423,7 @@ void iq151_state::iq151(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("iq151_cass");
TIMER(config, "cassette_timer").configure_periodic(FUNC(iq151_state::cassette_timer), attotime::from_hz(2000));
diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp
index a6850b4e0d8..a14515b6880 100644
--- a/src/mame/drivers/jr100.cpp
+++ b/src/mame/drivers/jr100.cpp
@@ -56,7 +56,6 @@ TODO:
#include "machine/6522via.h"
#include "machine/timer.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -395,11 +394,11 @@ void jr100_state::jr100(machine_config &config)
m_via->irq_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25);
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00);
CASSETTE(config, m_cassette, 0);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* quickload */
QUICKLOAD(config, "quickload", "prg", attotime::from_seconds(2)).set_load_callback(FUNC(jr100_state::quickload_cb), this);
diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp
index 7df3d16c23b..db9e50d17b9 100644
--- a/src/mame/drivers/jtc.cpp
+++ b/src/mame/drivers/jtc.cpp
@@ -24,7 +24,6 @@ To Do:
#include "imagedev/cassette.h"
#include "machine/ram.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "imagedev/snapquik.h"
#include "emupal.h"
#include "screen.h"
@@ -818,14 +817,14 @@ void jtc_state::basic(machine_config &config)
m_maincpu->p3_in_cb().set(FUNC(jtc_state::p3_r));
m_maincpu->p3_out_cb().set(FUNC(jtc_state::p3_w));
+ /* sound hardware */
+ SPEAKER(config, "mono").front_center();
+ SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50);
+
/* cassette */
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
-
- /* sound hardware */
- SPEAKER(config, "mono").front_center();
- SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.25);
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* printer */
CENTRONICS(config, m_centronics, centronics_devices, "printer");
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index 1b326cec830..2dbd54e6da8 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -54,7 +54,6 @@ Ports:
#include "sound/ay8910.h"
#include "sound/sp0256.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
@@ -777,7 +776,6 @@ void ace_state::ace(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", 1.00);
AY8910(config, AY8910_TAG, XTAL(6'500'000) / 2).add_route(ALL_OUTPUTS, "mono", 0.25);
@@ -789,6 +787,7 @@ void ace_state::ace(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(ace_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("jupace_cass");
SNAPSHOT(config, "snapshot", "ace", attotime::from_seconds(1)).set_load_callback(FUNC(ace_state::snapshot_cb), this);
diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp
index 8ea5b74bc28..83a4faa93e5 100644
--- a/src/mame/drivers/kim1.cpp
+++ b/src/mame/drivers/kim1.cpp
@@ -60,7 +60,6 @@ TODO:
#include "emu.h"
#include "includes/kim1.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "kim1.lh"
@@ -252,6 +251,8 @@ void kim1_state::kim1(machine_config &config)
// video hardware
config.set_default_layout(layout_kim1);
+ SPEAKER(config, "mono").front_center();
+
// devices
MOS6530(config, m_riot2, 1000000);
m_riot2->in_pa_callback().set(FUNC(kim1_state::kim1_u2_read_a));
@@ -264,11 +265,9 @@ void kim1_state::kim1(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_formats(kim1_cassette_formats);
m_cass->set_default_state(CASSETTE_STOPPED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cass->set_interface ("kim1_cass");
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
-
TIMER(config, "led_timer").configure_periodic(FUNC(kim1_state::kim1_update_leds), attotime::from_hz(60));
TIMER(config, "cassette_timer").configure_periodic(FUNC(kim1_state::kim1_cassette_input), attotime::from_hz(44100));
diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp
index 59997f6599b..39ae8719f57 100644
--- a/src/mame/drivers/lola8a.cpp
+++ b/src/mame/drivers/lola8a.cpp
@@ -54,7 +54,6 @@ TO DO
#include "cpu/i8085/i8085.h"
#include "imagedev/cassette.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
#include "screen.h"
@@ -322,7 +321,7 @@ void lola8a_state::lola8a(machine_config &config)
/* Cassette */
CASSETTE(config, m_cass);
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp
index eb2f8c69330..f529443a2b1 100644
--- a/src/mame/drivers/lviv.cpp
+++ b/src/mame/drivers/lviv.cpp
@@ -286,7 +286,6 @@ Timings:
#include "includes/lviv.h"
#include "cpu/i8085/i8085.h"
-#include "sound/wave.h"
#include "softlist.h"
#include "speaker.h"
@@ -458,7 +457,6 @@ void lviv_state::lviv(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);
/* snapshot */
@@ -467,6 +465,7 @@ void lviv_state::lviv(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(lviv_lvt_format);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("lviv_cass");
SOFTWARE_LIST(config, "cass_list").set_original("lviv");
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index 70eb5ce1b16..de358f074d6 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -280,7 +280,6 @@ Few other notes:
#include "machine/z80daisy.h"
#include "machine/z80ctc.h"
#include "sound/sn76496.h"
-#include "sound/wave.h"
#include "video/tms9928a.h"
#include "bus/m5/rom.h"
@@ -1418,7 +1417,6 @@ void m5_state::m5(machine_config &config)
// sound hardware
SPEAKER(config, "mono").front_center();
SN76489A(config, SN76489AN_TAG, 14.318181_MHz_XTAL / 4).add_route(ALL_OUTPUTS, "mono", 1.00);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
// devices
Z80CTC(config, m_ctc, 14.318181_MHz_XTAL / 4);
@@ -1435,6 +1433,7 @@ void m5_state::m5(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(sordm5_cassette_formats);
m_cassette->set_default_state(CASSETTE_PLAY);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("m5_cass");
I8255(config, m_ppi);
diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp
index 02cec394ae0..465344d9a37 100644
--- a/src/mame/drivers/mc10.cpp
+++ b/src/mame/drivers/mc10.cpp
@@ -16,7 +16,6 @@
#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "sound/wave.h"
#include "video/ef9345.h"
#include "video/mc6847.h"
@@ -525,11 +524,11 @@ void mc10_state::mc10(machine_config &config)
DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.0625);
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);
CASSETTE(config, m_cassette);
m_cassette->set_formats(coco_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("mc10_cass");
/* printer */
@@ -568,11 +567,11 @@ void mc10_state::alice32(machine_config &config)
DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.0625);
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);
CASSETTE(config, m_cassette);
m_cassette->set_formats(alice32_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("mc10_cass");
/* printer */
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index e65f3834a43..d676ebbe4c2 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -31,7 +31,6 @@
#include "machine/rescap.h"
#include "machine/timer.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "video/mc6847.h"
@@ -577,11 +576,11 @@ void mc1000_state::mc1000(machine_config &config)
ay8910.port_b_read_callback().set(FUNC(mc1000_state::keydata_r));
ay8910.port_a_write_callback().set(FUNC(mc1000_state::keylatch_w));
ay8910.add_route(ALL_OUTPUTS, "mono", 0.25);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
/* devices */
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);
m_cassette->set_interface("mc1000_cass");
SOFTWARE_LIST(config, "cass_list").set_original("mc1000_cass");
diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp
index aa7d573dc78..f388f3b5cfd 100644
--- a/src/mame/drivers/mc1502.cpp
+++ b/src/mame/drivers/mc1502.cpp
@@ -20,7 +20,6 @@
#include "bus/rs232/rs232.h"
#include "cpu/i86/i86.h"
#include "machine/kb_7007_3.h"
-#include "sound/wave.h"
#include "softlist.h"
#include "speaker.h"
@@ -291,7 +290,6 @@ void mc1502_state::mc1502(machine_config &config)
ISA8_SLOT(config, "isa2", 0, "isa", mc1502_isa8_cards, "rom", false);
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.80);
CENTRONICS(config, m_centronics, centronics_devices, "printer");
@@ -307,6 +305,7 @@ void mc1502_state::mc1502(machine_config &config)
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);
SOFTWARE_LIST(config, "flop_list").set_original("mc1502_flop");
// SOFTWARE_LIST(config, "cass_list").set_original("mc1502_cass");
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index 60546c60f84..242de177330 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -80,7 +80,6 @@ TODO
#include "machine/6850acia.h"
#include "machine/clock.h"
#include "machine/timer.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "mekd2.lh"
@@ -379,9 +378,9 @@ void mekd2_state::mekd2(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
/* Devices */
PIA6821(config, m_pia_s, 0);
diff --git a/src/mame/drivers/meritum.cpp b/src/mame/drivers/meritum.cpp
index 3d589ce3bda..31b8fef11f8 100644
--- a/src/mame/drivers/meritum.cpp
+++ b/src/mame/drivers/meritum.cpp
@@ -47,7 +47,6 @@ perhaps III:
#include "machine/i8255.h"
#include "machine/pit8253.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "screen.h"
#include "speaker.h"
#include "emupal.h"
@@ -436,10 +435,11 @@ void meritum_state::meritum(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 */
CASSETTE(config, m_cassette);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+
QUICKLOAD(config, "quickload", "cmd", attotime::from_seconds(1)).set_load_callback(FUNC(meritum_state::quickload_cb), this);
}
diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp
index 8fd5e5d92e2..bfa0bc48087 100644
--- a/src/mame/drivers/microtan.cpp
+++ b/src/mame/drivers/microtan.cpp
@@ -58,7 +58,6 @@
/* Components */
#include "cpu/m6502/m6502.h"
#include "machine/mos6551.h"
-#include "sound/wave.h"
#include "emupal.h"
@@ -247,7 +246,6 @@ void microtan_state::microtan(machine_config &config)
/* sound hardware */
SPEAKER(config, "speaker").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05);
AY8910(config, m_ay8910[0], 1000000).add_route(ALL_OUTPUTS, "speaker", 0.5);
AY8910(config, m_ay8910[1], 1000000).add_route(ALL_OUTPUTS, "speaker", 0.5);
@@ -259,6 +257,7 @@ void microtan_state::microtan(machine_config &config)
/* cassette */
CASSETTE(config, m_cassette);
+ m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05);
TIMER(config, "read_cassette").configure_periodic(FUNC(microtan_state::read_cassette), attotime::from_hz(20000)); // cass read
/* acia */
diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp
index 5f8679b751c..1d0d2cdef28 100644
--- a/src/mame/drivers/mikro80.cpp
+++ b/src/mame/drivers/mikro80.cpp
@@ -14,7 +14,6 @@
#include "formats/rk_cas.h"
#include "includes/mikro80.h"
#include "sound/volt_reg.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "softlist.h"
@@ -190,11 +189,11 @@ void mikro80_state::mikro80(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
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(rk8_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("mikro80_cass");
SOFTWARE_LIST(config, "cass_list").set_original("mikro80");
diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp
index a059a5cf020..7b51a032f9f 100644
--- a/src/mame/drivers/mikrosha.cpp
+++ b/src/mame/drivers/mikrosha.cpp
@@ -15,7 +15,6 @@
#include "imagedev/cassette.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -241,7 +240,6 @@ void mikrosha_state::mikrosha(machine_config &config)
PALETTE(config, m_palette, FUNC(mikrosha_state::radio86_palette), 3);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
I8257(config, m_dma8257, XTAL(16'000'000) / 9);
m_dma8257->out_hrq_cb().set(FUNC(radio86_state::hrq_w));
@@ -253,6 +251,7 @@ void mikrosha_state::mikrosha(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(rkm_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("mikrosha_cass");
GENERIC_CARTSLOT(config, m_cart, generic_plain_slot, "mikrosha_cart", "bin,rom");
diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp
index 331e53fcb2a..94dd1b72b36 100644
--- a/src/mame/drivers/mk14.cpp
+++ b/src/mame/drivers/mk14.cpp
@@ -39,7 +39,6 @@ ToDo:
#include "machine/ins8154.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "mk14.lh"
@@ -219,7 +218,6 @@ void mk14_state::mk14(machine_config &config)
// sound
SPEAKER(config, "speaker").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "speaker", 0.05);
DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.25);
ZN425E(config, "dac8", 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // Ferranti ZN425E
voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
@@ -234,6 +232,7 @@ void mk14_state::mk14(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp
index 3f660533415..ef2f512e32d 100644
--- a/src/mame/drivers/mkit09.cpp
+++ b/src/mame/drivers/mkit09.cpp
@@ -35,7 +35,6 @@ Test Paste:
#include "cpu/m6809/m6809.h"
#include "imagedev/cassette.h"
#include "machine/6821pia.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "mkit09.lh"
@@ -209,7 +208,6 @@ void mkit09_state::mkit09(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
/* Devices */
PIA6821(config, m_pia, 0);
@@ -221,6 +219,7 @@ void mkit09_state::mkit09(machine_config &config)
m_pia->irqb_handler().set_inputline("maincpu", M6809_IRQ_LINE);
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
void mkit09_state::mkit09a(machine_config &config)
@@ -234,7 +233,6 @@ void mkit09_state::mkit09a(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
/* Devices */
PIA6821(config, m_pia, 0);
@@ -246,6 +244,7 @@ void mkit09_state::mkit09a(machine_config &config)
m_pia->irqb_handler().set_inputline("maincpu", M6809_IRQ_LINE);
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp
index 5d1b60b5949..36a00e126d3 100644
--- a/src/mame/drivers/mmd1.cpp
+++ b/src/mame/drivers/mmd1.cpp
@@ -153,7 +153,6 @@ ToDo
#include "cpu/i8085/i8085.h"
#include "machine/i8279.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "mmd1.lh"
#include "mmd2.lh"
@@ -567,10 +566,11 @@ void mmd1_state::mmd2(machine_config &config)
kbdc.in_shift_callback().set_constant(1); // Shift key
kbdc.in_ctrl_callback().set_constant(1);
+ SPEAKER(config, "mono").front_center();
+
/* Cassette */
CASSETTE(config, m_cass);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp
index 2521ae49cdb..a8ba92808fa 100644
--- a/src/mame/drivers/modellot.cpp
+++ b/src/mame/drivers/modellot.cpp
@@ -36,6 +36,9 @@ Optional ports:
It's not clear if these are meant to be 3881 PIOs connected to the devices, or for
the devices themselves. An example shows a i8251 used as the US1 device.
+There's a rom missing EC00-EFFF, it is used if you try to save to tape.
+All input must in UPPER case.
+
***********************************************************************************/
#include "emu.h"
diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp
index c0f1aa54baa..2c000f6994b 100644
--- a/src/mame/drivers/ms0515.cpp
+++ b/src/mame/drivers/ms0515.cpp
@@ -38,7 +38,6 @@
#include "machine/ram.h"
#include "machine/wd_fdc.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp
index 405b494e032..815dbb89685 100644
--- a/src/mame/drivers/mycom.cpp
+++ b/src/mame/drivers/mycom.cpp
@@ -57,7 +57,6 @@
#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/sn76496.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
#include "screen.h"
@@ -549,15 +548,13 @@ void mycom_state::mycom(machine_config &config)
m_crtc->set_update_row_callback(FUNC(mycom_state::crtc_update_row), this);
SPEAKER(config, "mono").front_center();
-
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
-
SN76489(config, m_audio, 10_MHz_XTAL / 4).add_route(ALL_OUTPUTS, "mono", 1.50);
/* Devices */
MSM5832(config, m_rtc, 32.768_kHz_XTAL);
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
FD1771(config, m_fdc, 16_MHz_XTAL / 16);
FLOPPY_CONNECTOR(config, "fdc:0", mycom_floppies, "525sd", floppy_image_device::default_floppy_formats).enable_sound(true);
diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp
index 71115b12394..dce21ba2af8 100644
--- a/src/mame/drivers/mz2000.cpp
+++ b/src/mame/drivers/mz2000.cpp
@@ -28,7 +28,6 @@
#include "machine/wd_fdc.h"
#include "machine/z80pio.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
@@ -902,6 +901,9 @@ void mz2000_state::mz2000(machine_config &config)
m_pit8253->set_clk<1>(31250); /* needed by "Art Magic" to boot */
m_pit8253->set_clk<2>(31250);
+ SPEAKER(config, "mono").front_center();
+ BEEP(config, "beeper", 4096).add_route(ALL_OUTPUTS,"mono",0.15);
+
MB8877(config, m_mb8877a, 1_MHz_XTAL);
FLOPPY_CONNECTOR(config, "mb8877a:0", mz2000_floppies, "dd", mz2000_state::floppy_formats);
@@ -914,6 +916,7 @@ void mz2000_state::mz2000(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_formats(mz700_cassette_formats);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cass->set_interface("mz_cass");
SOFTWARE_LIST(config, "cass_list").set_original("mz2000_cass");
@@ -929,12 +932,6 @@ void mz2000_state::mz2000(machine_config &config)
GFXDECODE(config, "gfxdecode", m_palette, gfx_mz2000);
PALETTE(config, m_palette, palette_device::BRG_3BIT);
-
- SPEAKER(config, "mono").front_center();
-
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
-
- BEEP(config, "beeper", 4096).add_route(ALL_OUTPUTS,"mono",0.15);
}
void mz2000_state::mz80b(machine_config &config)
diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp
index 09b1625cd39..038828de369 100644
--- a/src/mame/drivers/mz700.cpp
+++ b/src/mame/drivers/mz700.cpp
@@ -84,7 +84,6 @@
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "sound/wave.h"
#include "softlist.h"
#include "speaker.h"
@@ -394,7 +393,6 @@ void mz_state::mz700(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);
/* ne556 timers */
@@ -421,6 +419,7 @@ void mz_state::mz700(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);
m_cassette->set_interface("mz_cass");
SOFTWARE_LIST(config, "cass_list").set_original("mz700_cass");
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp
index fc49e19f3bb..8bd827fb7c3 100644
--- a/src/mame/drivers/newbrain.cpp
+++ b/src/mame/drivers/newbrain.cpp
@@ -50,7 +50,6 @@
#include "emu.h"
#include "includes/newbrain.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "screen.h"
@@ -837,21 +836,21 @@ void newbrain_state::newbrain(machine_config &config)
// devices
NEWBRAIN_EXPANSION_SLOT(config, m_exp, XTAL(16'000'000)/4, newbrain_expansion_cards, "eim");
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cassette1);
m_cassette1->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette1->add_route(ALL_OUTPUTS, "mono", 0.05);
CASSETTE(config, m_cassette2);
m_cassette2->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette2->add_route(ALL_OUTPUTS, "mono", 0.05);
RS232_PORT(config, RS232_V24_TAG, default_rs232_devices, nullptr);
RS232_PORT(config, RS232_PRN_TAG, default_rs232_devices, nullptr);
// internal ram
RAM(config, RAM_TAG).set_default_size("32K");
-
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave1", m_cassette1).add_route(ALL_OUTPUTS, "mono", 0.05);
- WAVE(config, "wave2", m_cassette2).add_route(ALL_OUTPUTS, "mono", 0.05);
}
diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp
index 50e9cb633ce..308ffe6c857 100644
--- a/src/mame/drivers/ondra.cpp
+++ b/src/mame/drivers/ondra.cpp
@@ -15,7 +15,6 @@
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "softlist.h"
@@ -144,10 +143,10 @@ void ondra_state::ondra(machine_config &config)
// sound hardware
SPEAKER(config, "mono").front_center();
- 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);
m_cassette->set_interface("ondra_cass");
SOFTWARE_LIST(config, "cass_list").set_original("ondra");
diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp
index 33e6e69ee05..62f25550534 100644
--- a/src/mame/drivers/orao.cpp
+++ b/src/mame/drivers/orao.cpp
@@ -16,7 +16,6 @@
#include "includes/orao.h"
#include "cpu/m6502/m6502.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
@@ -192,11 +191,11 @@ void orao_state::orao(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, m_cassette);
m_cassette->set_formats(orao_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("orao_cass");
SOFTWARE_LIST(config, "cass_list").set_original("orao");
diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp
index 40bb7910396..fb42f47ac17 100644
--- a/src/mame/drivers/oric.cpp
+++ b/src/mame/drivers/oric.cpp
@@ -31,7 +31,6 @@
#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
@@ -802,7 +801,6 @@ void oric_state::oric(machine_config &config, bool add_ext)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
AY8912(config, m_psg, 12_MHz_XTAL / 12);
m_psg->set_flags(AY8910_DISCRETE_OUTPUT);
@@ -820,7 +818,8 @@ void oric_state::oric(machine_config &config, bool add_ext)
/* cassette */
CASSETTE(config, m_cassette, 0);
m_cassette->set_formats(oric_cassette_formats);
- m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED);
+ m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* via */
VIA6522(config, m_via, 12_MHz_XTAL / 12);
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index 40991a1595a..2b89d4f3811 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -221,7 +221,6 @@ PRINT FRE(0)
#include "includes/osi.h"
#include "machine/clock.h"
-#include "sound/wave.h"
#include "screen.h"
#include "speaker.h"
@@ -742,7 +741,6 @@ void sb2m600_state::osi600(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
DISCRETE(config, m_discrete);
m_discrete->set_intf(osi600_discrete_interface);
m_discrete->add_route(ALL_OUTPUTS, "mono", 0.50);
@@ -757,6 +755,7 @@ void sb2m600_state::osi600(machine_config &config)
/* cassette */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(sb2m600_state::kansas_w), attotime::from_hz(4800)); // cass write
TIMER(config, "kansas_r").configure_periodic(FUNC(sb2m600_state::kansas_r), attotime::from_hz(40000)); // cass read
@@ -778,7 +777,6 @@ void uk101_state::uk101(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
/* cassette ACIA */
ACIA6850(config, m_acia, 0);
@@ -790,6 +788,7 @@ void uk101_state::uk101(machine_config &config)
/* cassette */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(uk101_state::kansas_w), attotime::from_hz(4800)); // cass write
TIMER(config, "kansas_r").configure_periodic(FUNC(uk101_state::kansas_r), attotime::from_hz(40000)); // cass read
@@ -811,7 +810,6 @@ void c1p_state::c1p(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
DISCRETE(config, m_discrete);
m_discrete->set_intf(osi600c_discrete_interface);
m_discrete->add_route(ALL_OUTPUTS, "mono", 0.50);
@@ -831,6 +829,7 @@ void c1p_state::c1p(machine_config &config)
/* cassette */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(c1p_state::kansas_w), attotime::from_hz(4800)); // cass write
TIMER(config, "kansas_r").configure_periodic(FUNC(c1p_state::kansas_r), attotime::from_hz(40000)); // cass read
diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp
index 03ff502a4ce..8b41a0dbc57 100644
--- a/src/mame/drivers/partner.cpp
+++ b/src/mame/drivers/partner.cpp
@@ -14,7 +14,6 @@
#include "cpu/i8085/i8085.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -192,7 +191,6 @@ void partner_state::partner(machine_config &config)
PALETTE(config, m_palette, FUNC(partner_state::radio86_palette), 3);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
auto &dma8257(I8257(config, "dma8257", 16_MHz_XTAL / 9));
dma8257.out_hrq_cb().set(FUNC(partner_state::hrq_w));
@@ -206,6 +204,7 @@ void partner_state::partner(machine_config &config)
auto &cassette(CASSETTE(config, "cassette"));
cassette.set_formats(rkp_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("partner_cass");
SOFTWARE_LIST(config, "cass_list").set_type("partner_cass", SOFTWARE_LIST_ORIGINAL_SYSTEM);
diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp
index 57e504b20fb..b95f14e2166 100644
--- a/src/mame/drivers/pcm.cpp
+++ b/src/mame/drivers/pcm.cpp
@@ -61,7 +61,6 @@
#include "machine/z80sio.h"
#include "machine/z80pio.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -278,12 +277,12 @@ void pcm_state::pcm(machine_config &config)
/* Sound */
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 */
K7659_KEYBOARD(config, K7659_KEYBOARD_TAG, 0);
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
Z80PIO(config, m_pio_u, XTAL(10'000'000)/4);
m_pio_u->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
diff --git a/src/mame/drivers/pecom.cpp b/src/mame/drivers/pecom.cpp
index 73952f6f819..917815a8bb1 100644
--- a/src/mame/drivers/pecom.cpp
+++ b/src/mame/drivers/pecom.cpp
@@ -13,7 +13,6 @@
#include "emu.h"
#include "includes/pecom.h"
-#include "sound/wave.h"
#include "softlist.h"
#include "speaker.h"
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index 209ad99a690..548bc7c15b3 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -44,7 +44,6 @@
#include "imagedev/cassette.h"
#include "machine/6821pia.h"
#include "machine/timer.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "softlist.h"
@@ -509,7 +508,6 @@ void pegasus_state::pegasus(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
/* devices */
PIA6821(config, m_pia_s, 0);
@@ -535,6 +533,7 @@ void pegasus_state::pegasus(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED|CASSETTE_MOTOR_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
/* Software lists */
SOFTWARE_LIST(config, "cart_list").set_original("pegasus_cart");
diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp
index dfe52aa7134..090b4b2bd7a 100644
--- a/src/mame/drivers/pencil2.cpp
+++ b/src/mame/drivers/pencil2.cpp
@@ -85,7 +85,6 @@ ToDo:
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "sound/sn76496.h"
-#include "sound/wave.h"
#include "video/tms9928a.h"
#include "bus/centronics/ctronics.h"
@@ -327,11 +326,11 @@ void pencil2_state::pencil2(machine_config &config)
// sound hardware
SPEAKER(config, "mono").front_center();
SN76489A(config, "sn76489a", XTAL(10'738'635)/3).add_route(ALL_OUTPUTS, "mono", 1.00); // guess
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
/* cassette */
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
/* cartridge */
GENERIC_CARTSLOT(config, m_cart, generic_plain_slot, "pencil2_cart");
diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp
index c199888ccfe..b52c1417f44 100644
--- a/src/mame/drivers/phunsy.cpp
+++ b/src/mame/drivers/phunsy.cpp
@@ -32,7 +32,6 @@
#include "imagedev/snapquik.h"
#include "machine/keyboard.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -364,13 +363,14 @@ void phunsy_state::phunsy(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
/* Devices */
generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
keyboard.set_keyboard_callback(FUNC(phunsy_state::kbd_put));
+
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
/* quickload */
QUICKLOAD(config, "quickload", "bin", attotime::from_seconds(2)).set_load_callback(FUNC(phunsy_state::quickload_cb), this);
diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp
index b6ea7e92416..2c4c86631d4 100644
--- a/src/mame/drivers/pk8000.cpp
+++ b/src/mame/drivers/pk8000.cpp
@@ -16,7 +16,6 @@
#include "machine/i8255.h"
#include "imagedev/cassette.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "machine/ram.h"
#include "screen.h"
@@ -393,11 +392,11 @@ void pk8000_state::pk8000(machine_config &config)
/* audio 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);
CASSETTE(config, m_cassette);
m_cassette->set_formats(fmsx_cassette_formats);
m_cassette->set_default_state(CASSETTE_PLAY);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* internal ram */
RAM(config, RAM_TAG).set_default_size("64K");
diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp
index 1ba5bf15ae1..94c88be77f3 100644
--- a/src/mame/drivers/pmd85.cpp
+++ b/src/mame/drivers/pmd85.cpp
@@ -180,7 +180,6 @@ I/O ports
#include "machine/i8255.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -628,13 +627,13 @@ void pmd85_state::pmd85(machine_config &config, bool with_uart)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
/* cassette */
CASSETTE(config, m_cassette);
m_cassette->set_formats(pmd85_cassette_formats);
m_cassette->set_create_opts(&pmd85_cassette_options);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("pmd85_cass");
/* software lists */
diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp
index 6d9a2302814..b93b4d1323e 100644
--- a/src/mame/drivers/pmi80.cpp
+++ b/src/mame/drivers/pmi80.cpp
@@ -35,7 +35,6 @@ Notes:
#include "machine/i8255.h"
#include "imagedev/cassette.h"
#include "machine/timer.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "pmi80.lh"
@@ -220,11 +219,12 @@ void pmi80_state::pmi80(machine_config &config)
I8255A(config, "ppi2"); // User PPI
+ SPEAKER(config, "mono").front_center();
+
// cassette
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_r").configure_periodic(FUNC(pmi80_state::kansas_r), attotime::from_hz(40000));
/* video hardware */
diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp
index fcee90fd96d..ba363159fa4 100644
--- a/src/mame/drivers/poisk1.cpp
+++ b/src/mame/drivers/poisk1.cpp
@@ -33,7 +33,6 @@
#include "machine/pit8253.h"
#include "machine/ram.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/cgapal.h"
#include "emupal.h"
@@ -680,15 +679,8 @@ void p1_state::poisk1(machine_config &config)
ISA8_SLOT(config, "isa3", 0, m_isabus, p1_isa8_cards, nullptr, false);
ISA8_SLOT(config, "isa4", 0, m_isabus, p1_isa8_cards, nullptr, false);
- CASSETTE(config, m_cassette);
- m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
-
- SOFTWARE_LIST(config, "flop_list").set_original("poisk1_flop");
-// SOFTWARE_LIST(config, "cass_list").set_original("poisk1_cass");
-
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);
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_raw(XTAL(15'000'000), 912,0,640, 262,0,200);
@@ -697,6 +689,13 @@ void p1_state::poisk1(machine_config &config)
/* XXX verify palette */
PALETTE(config, m_palette, FUNC(p1_state::p1_palette), CGA_PALETTE_SETS * 16);
+ 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);
+
+ SOFTWARE_LIST(config, "flop_list").set_original("poisk1_flop");
+// SOFTWARE_LIST(config, "cass_list").set_original("poisk1_cass");
+
/* internal ram */
RAM(config, RAM_TAG).set_default_size("512K");
}
diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp
index f4f28a7201c..530a4d8b446 100644
--- a/src/mame/drivers/poly88.cpp
+++ b/src/mame/drivers/poly88.cpp
@@ -47,7 +47,6 @@ at least some models of the Poly-88 are known to have used.)
#include "cpu/i8085/i8085.h"
//#include "bus/s100/s100.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -223,12 +222,12 @@ void poly88_state::poly88(machine_config &config)
/* audio hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
/* cassette */
CASSETTE(config, m_cassette);
m_cassette->set_create_opts(&poly88_cassette_options);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* uart */
I8251(config, m_usart, 16.5888_MHz_XTAL / 9);
diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp
index 0b12a2c6813..5db10bcf489 100644
--- a/src/mame/drivers/primo.cpp
+++ b/src/mame/drivers/primo.cpp
@@ -110,7 +110,6 @@ Interrupts:
#include "includes/primo.h"
#include "cpu/z80/z80.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -267,7 +266,6 @@ void primo_state::primoa32(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);
/* snapshot/quickload */
@@ -278,6 +276,7 @@ void primo_state::primoa32(machine_config &config)
m_cassette->set_formats(primo_ptp_format);
m_cassette->set_create_opts(&primo_cassette_options);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* floppy from serial bus */
cbm_iec_slot_device::add(config, m_iec, nullptr);
diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp
index 2f6944a419c..2f9364a0248 100644
--- a/src/mame/drivers/pro80.cpp
+++ b/src/mame/drivers/pro80.cpp
@@ -27,7 +27,6 @@ Then press W to save. To load, press L. If it says r at the end, it indicates a
#include "machine/timer.h"
#include "machine/z80pio.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "speaker.h"
@@ -184,13 +183,14 @@ void pro80_state::pro80(machine_config &config)
/* video hardware */
config.set_default_layout(layout_pro80);
+ Z80PIO(config, "pio", XTAL(4'000'000) / 2);
+
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
- /* Devices */
+ // Cassette
CASSETTE(config, m_cass);
- Z80PIO(config, "pio", XTAL(4'000'000) / 2);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_r").configure_periodic(FUNC(pro80_state::kansas_r), attotime::from_hz(40000)); // cass read
}
diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp
index 0152c8ec072..ad8dfb096c6 100644
--- a/src/mame/drivers/proteus3.cpp
+++ b/src/mame/drivers/proteus3.cpp
@@ -54,7 +54,6 @@
#include "machine/clock.h"
#include "machine/keyboard.h"
#include "machine/timer.h"
-#include "sound/wave.h"
#include "bus/rs232/rs232.h"
@@ -404,10 +403,11 @@ void proteus3_state::proteus3(machine_config &config)
ACIA6850(config, m_acia1, 0);
m_acia1->txd_handler().set([this] (bool state) { m_cassbit = state; });
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_w").configure_periodic(FUNC(proteus3_state::kansas_w), attotime::from_hz(4800));
TIMER(config, "kansas_r").configure_periodic(FUNC(proteus3_state::kansas_r), attotime::from_hz(40000));
diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp
index aef1d26dd3b..3cb2478fb85 100644
--- a/src/mame/drivers/ptcsol.cpp
+++ b/src/mame/drivers/ptcsol.cpp
@@ -124,7 +124,6 @@
#include "machine/clock.h"
#include "machine/keyboard.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
@@ -759,16 +758,16 @@ void sol20_state::sol20(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 2.00); // music board
- WAVE(config, "wave1", m_cass1).add_route(ALL_OUTPUTS, "mono", 0.05); // cass1 speaker
- WAVE(config, "wave2", m_cass2).add_route(ALL_OUTPUTS, "mono", 0.05); // cass2 speaker
// devices
CASSETTE(config, m_cass1).set_formats(sol20_cassette_formats);
m_cass1->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass1->add_route(ALL_OUTPUTS, "mono", 0.05); // cass1 speaker
m_cass1->set_interface("sol20_cass");
CASSETTE(config, m_cass2).set_formats(sol20_cassette_formats);
m_cass2->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass2->add_route(ALL_OUTPUTS, "mono", 0.05); // cass2 speaker
m_cass2->set_interface("sol20_cass");
AY51013(config, m_uart); // TMS6011NC
diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp
index d419b2f2f90..196eaad7022 100644
--- a/src/mame/drivers/pv2000.cpp
+++ b/src/mame/drivers/pv2000.cpp
@@ -32,7 +32,6 @@ For BIOS CRC confirmation
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "sound/wave.h"
#include "video/tms9928a.h"
#include "imagedev/cassette.h"
#include "bus/generic/slot.h"
@@ -401,14 +400,12 @@ void pv2000_state::pv2000(machine_config &config)
// sound hardware
SPEAKER(config, "mono").front_center();
-
SN76489A(config, "sn76489a", XTAL(7'159'090)/2).add_route(ALL_OUTPUTS, "mono", 1.00); /* 3.579545 MHz */
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
-
/* cassette */
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
/* cartridge */
GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "pv2000_cart", "bin,rom,col").set_device_load(FUNC(pv2000_state::cart_load), this);
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index 4b574a738d7..9f51566a4ae 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -22,7 +22,6 @@
#include "machine/ram.h"
#include "machine/timer.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "diserial.h"
#include "emupal.h"
@@ -1508,7 +1507,6 @@ void px4_state::px4(machine_config &config)
// sound hardware
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.0);
- WAVE(config, "wave", m_ext_cas).add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "one_sec").configure_periodic(FUNC(px4_state::upd7508_1sec_callback), attotime::from_seconds(1));
TIMER(config, "frc").configure_periodic(FUNC(px4_state::frc_tick), attotime::from_hz(XTAL(7'372'800) / 2 / 6));
@@ -1528,6 +1526,7 @@ void px4_state::px4(machine_config &config)
// external cassette
CASSETTE(config, m_ext_cas);
m_ext_cas->set_default_state(CASSETTE_PLAY | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED);
+ m_ext_cas->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, m_ext_cas_timer).configure_generic(FUNC(px4_state::ext_cassette_read));
diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp
index 424c52560cd..83fa9259379 100644
--- a/src/mame/drivers/radio86.cpp
+++ b/src/mame/drivers/radio86.cpp
@@ -15,7 +15,6 @@
#include "cpu/i8085/i8085.h"
#include "imagedev/cassette.h"
#include "machine/i8255.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -488,7 +487,6 @@ void radio86_state::radio86(machine_config &config)
PALETTE(config, m_palette, FUNC(radio86_state::radio86_palette), 3);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
I8257(config, m_dma8257, XTAL(16'000'000) / 9);
m_dma8257->out_hrq_cb().set(FUNC(radio86_state::hrq_w));
@@ -500,6 +498,7 @@ void radio86_state::radio86(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(rkr_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("radio86_cass");
SOFTWARE_LIST(config, "cass_list").set_original("radio86_cass");
diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp
index 3e07e6080ea..30920eb7cf4 100644
--- a/src/mame/drivers/ravens.cpp
+++ b/src/mame/drivers/ravens.cpp
@@ -75,7 +75,6 @@ ToDo:
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "machine/terminal.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "ravens.lh"
@@ -353,10 +352,11 @@ void ravens_state::ravens(machine_config &config)
/* quickload */
QUICKLOAD(config, "quickload", "pgm", attotime::from_seconds(1)).set_load_callback(FUNC(ravens_state::quickload_cb), this);
+ SPEAKER(config, "mono").front_center();
+
/* cassette */
CASSETTE(config, m_cass);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
void ravens_state::ravens2(machine_config &config)
@@ -377,10 +377,11 @@ void ravens_state::ravens2(machine_config &config)
/* quickload */
QUICKLOAD(config, "quickload", "pgm", attotime::from_seconds(1)).set_load_callback(FUNC(ravens_state::quickload_cb), this);
+ SPEAKER(config, "mono").front_center();
+
/* cassette */
CASSETTE(config, m_cass);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index 7e99f3edd27..92d7077c0bd 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -22,7 +22,6 @@
#include "machine/wd_fdc.h"
#include "sound/sn76496.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/i82730.h"
#include "bus/centronics/ctronics.h"
@@ -572,15 +571,10 @@ void rc759_state::rc759(machine_config &config)
generic_keyboard_device &keyb(GENERIC_KEYBOARD(config, "keyb", 0));
keyb.set_keyboard_callback(FUNC(rc759_state::keyb_put));
- // cassette
- CASSETTE(config, m_cas);
- m_cas->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
-
// sound
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
SN76489A(config, m_snd, 20_MHz_XTAL / 10).add_route(ALL_OUTPUTS, "mono", 1.0);
- WAVE(config, "wave", m_cas).add_route(ALL_OUTPUTS, "mono", 0.05);
// internal centronics
CENTRONICS(config, m_centronics, centronics_devices, "printer");
@@ -604,6 +598,11 @@ void rc759_state::rc759(machine_config &config)
// floppy drives
FLOPPY_CONNECTOR(config, "fdc:0", rc759_floppies, "hd", floppy_image_device::default_floppy_formats);
FLOPPY_CONNECTOR(config, "fdc:1", rc759_floppies, "hd", floppy_image_device::default_floppy_formats);
+
+ // cassette
+ CASSETTE(config, m_cas);
+ m_cas->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cas->add_route(ALL_OUTPUTS, "mono", 0.05);
}
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index a6b0eba11e6..94ee0659acf 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -167,7 +167,6 @@ Module timer tag static_vblank_timer name m_expire.seconds
#include "emu.h"
#include "includes/rm380z.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "emupal.h"
@@ -256,12 +255,13 @@ void rm380z_state::rm380z(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
+ SPEAKER(config, "mono").front_center();
+
/* cassette */
CASSETTE(config, m_cassette);
// m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
/* RAM configurations */
RAM(config, RAM_TAG).set_default_size("56K");
diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp
index a668cc0ec3f..c8f1b4f51ac 100644
--- a/src/mame/drivers/rx78.cpp
+++ b/src/mame/drivers/rx78.cpp
@@ -64,7 +64,6 @@ Summary of Monitor commands.
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "machine/ram.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
@@ -496,14 +495,12 @@ void rx78_state::rx78(machine_config &config)
RAM(config, RAM_TAG).set_default_size("32K").set_extra_options("16K");
- CASSETTE(config, m_cass);
-
SPEAKER(config, "mono").front_center();
-
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
-
SN76489A(config, "sn1", XTAL(28'636'363)/8).add_route(ALL_OUTPUTS, "mono", 0.50); // unknown divider
+ CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
+
/* Software lists */
SOFTWARE_LIST(config, "cart_list").set_original("rx78");
}
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index 8693b99f834..4b7ae972852 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -31,7 +31,6 @@
#include "cpu/z80/z80.h"
#include "sound/saa1099.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -531,9 +530,15 @@ void samcoupe_state::samcoupe(machine_config &config)
MSM6242(config, m_rtc, 32.768_kHz_XTAL);
+ /* sound hardware */
+ SPEAKER(config, "mono").front_center();
+ SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
+ SAA1099(config, "saa1099", SAMCOUPE_XTAL_X1/3).add_route(ALL_OUTPUTS, "mono", 0.50); /* 8 MHz */
+
CASSETTE(config, m_cassette);
m_cassette->set_formats(tzx_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("samcoupe_cass");
SOFTWARE_LIST(config, "cass_list").set_original("samcoupe_cass");
@@ -542,12 +547,6 @@ void samcoupe_state::samcoupe(machine_config &config)
FLOPPY_CONNECTOR(config, "wd1772:1", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats);
SOFTWARE_LIST(config, "flop_list").set_original("samcoupe_flop");
- /* sound hardware */
- SPEAKER(config, "mono").front_center();
- SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
- SAA1099(config, "saa1099", SAMCOUPE_XTAL_X1/3).add_route(ALL_OUTPUTS, "mono", 0.50); /* 8 MHz */
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
-
/* internal ram */
RAM(config, RAM_TAG).set_default_size("512K").set_extra_options("256K,1280K,1536K,2304K,2560K,3328K,3584K,4352K,4608K");
}
diff --git a/src/mame/drivers/shine.cpp b/src/mame/drivers/shine.cpp
index 9c6e26a04a2..39a3dfa035a 100644
--- a/src/mame/drivers/shine.cpp
+++ b/src/mame/drivers/shine.cpp
@@ -17,7 +17,6 @@
#include "machine/wd_fdc.h"
#include "machine/input_merger.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/mc6847.h"
#include "bus/centronics/ctronics.h"
#include "emupal.h"
@@ -250,7 +249,6 @@ void shine_state::shine(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.00);
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
RAM(config, m_ram);
m_ram->set_default_size("32K");
@@ -273,6 +271,7 @@ void shine_state::shine(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index 1d6d586ac93..f7bde1b2acc 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -127,7 +127,6 @@ small ics.
#include "imagedev/cassette.h"
#include "machine/ram.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "video/mc6847.h"
#include "bus/centronics/ctronics.h"
@@ -487,7 +486,6 @@ void spc1000_state::spc1000(machine_config &config)
ay8910.port_a_read_callback().set(FUNC(spc1000_state::porta_r));
ay8910.port_b_write_callback().set("cent_data_out", FUNC(output_latch_device::bus_w));
ay8910.add_route(ALL_OUTPUTS, "mono", 1.00);
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
SPC1000_EXP_SLOT(config, "ext1", spc1000_exp);
@@ -502,6 +500,7 @@ void spc1000_state::spc1000(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_formats(spc1000_cassette_formats);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cass->set_interface("spc1000_cass");
SOFTWARE_LIST(config, "cass_list").set_original("spc1000_cass");
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index c5f593e51f6..8da3f204d41 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -230,7 +230,6 @@ TODO:
#include "machine/ram.h"
#include "machine/timer.h"
#include "sound/ay8910.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
@@ -916,7 +915,6 @@ void spc1500_state::spc1500(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
AY8910(config, m_sound, XTAL(4'000'000) / 2);
m_sound->port_a_read_callback().set(FUNC(spc1500_state::psga_r));
m_sound->port_b_write_callback().set(FUNC(spc1500_state::psgb_w));
@@ -931,8 +929,9 @@ void spc1500_state::spc1500(machine_config &config)
INPUT_BUFFER(config, "cent_status_in");
CASSETTE(config, m_cass);
- m_cass->set_formats(spc1000_cassette_formats);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cass->set_formats(spc1000_cassette_formats);
m_cass->set_interface("spc1500_cass");
SOFTWARE_LIST(config, "cass_list").set_original("spc1500_cass");
diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp
index f73df108b20..e8e193e63d1 100644
--- a/src/mame/drivers/spectrum.cpp
+++ b/src/mame/drivers/spectrum.cpp
@@ -279,7 +279,6 @@ SamRam
#include "includes/spectrum.h"
#include "cpu/z80/z80.h"
-#include "sound/wave.h"
#include "machine/spec_snqk.h"
#include "screen.h"
@@ -706,7 +705,6 @@ void spectrum_state::spectrum_common(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);
/* expansion port */
@@ -721,6 +719,7 @@ void spectrum_state::spectrum_common(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(tzx_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("spectrum_cass");
SOFTWARE_LIST(config, "cass_list").set_original("spectrum_cass");
diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp
index b8ffee2ba81..b7050e3dd88 100644
--- a/src/mame/drivers/svi318.cpp
+++ b/src/mame/drivers/svi318.cpp
@@ -16,7 +16,6 @@
#include "machine/ram.h"
#include "sound/ay8910.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/tms9928a.h"
#include "bus/generic/carts.h"
@@ -532,7 +531,6 @@ void svi3x8_state::svi318(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);
ay8910_device &psg(AY8910(config, "psg", XTAL(10'738'635) / 6));
psg.port_a_read_callback().set_ioport("JOY");
psg.port_b_write_callback().set(FUNC(svi3x8_state::bank_w));
@@ -540,8 +538,9 @@ void svi3x8_state::svi318(machine_config &config)
// cassette
CASSETTE(config, m_cassette);
- m_cassette->set_formats(svi_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+ m_cassette->set_formats(svi_cassette_formats);
m_cassette->set_interface("svi318_cass");
SOFTWARE_LIST(config, "cass_list").set_original("svi318_cass");
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index ec03e61a2bc..9b526a095df 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -61,7 +61,6 @@ Z - more scan lines per row (cursor is bigger)
#include "machine/keyboard.h"
#include "machine/wd_fdc.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "video/mc6845.h"
#include "emupal.h"
@@ -306,10 +305,10 @@ void tavernie_state::cpu09(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
/* Devices */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
pia6821_device &pia(PIA6821(config, "pia", 0));
pia.readpa_handler().set(FUNC(tavernie_state::pa_r));
diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp
index 652495e3fb8..cf7c6b29918 100644
--- a/src/mame/drivers/tec1.cpp
+++ b/src/mame/drivers/tec1.cpp
@@ -77,7 +77,6 @@ JMON ToDo:
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "speaker.h"
#include "tec1.lh"
@@ -91,7 +90,6 @@ public:
, m_maincpu(*this, "maincpu")
, m_speaker(*this, "speaker")
, m_cass(*this, "cassette")
- , m_wave(*this, "wave")
, m_key_pressed(0)
, m_io_line0(*this, "LINE0")
, m_io_line1(*this, "LINE1")
@@ -110,7 +108,6 @@ private:
required_device<cpu_device> m_maincpu;
required_device<speaker_sound_device> m_speaker;
optional_device<cassette_image_device> m_cass;
- optional_device<wave_device> m_wave;
bool m_key_pressed;
required_ioport m_io_line0;
required_ioport m_io_line1;
@@ -458,10 +455,10 @@ void tec1_state::tecjmon(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
/* Devices */
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp
index f170f241a1b..a2bfdd22b00 100644
--- a/src/mame/drivers/tiki100.cpp
+++ b/src/mame/drivers/tiki100.cpp
@@ -24,7 +24,6 @@
#include "emu.h"
#include "includes/tiki100.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -771,19 +770,19 @@ void tiki100_state::tiki100(machine_config &config)
output_latch_device &cent_data_out(OUTPUT_LATCH(config, "cent_data_out"));
m_centronics->set_output_latch(cent_data_out);
- CASSETTE(config, m_cassette);
- m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
-
- TIMER(config, "tape").configure_periodic(FUNC(tiki100_state::tape_tick), attotime::from_hz(44100));
-
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
AY8912(config, m_psg, 8_MHz_XTAL / 4);
m_psg->set_flags(AY8910_SINGLE_OUTPUT);
m_psg->port_a_write_callback().set(FUNC(tiki100_state::video_scroll_w));
m_psg->add_route(ALL_OUTPUTS, "mono", 0.25);
+ 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);
+
+ TIMER(config, "tape").configure_periodic(FUNC(tiki100_state::tape_tick), attotime::from_hz(44100));
+
/* internal ram */
RAM(config, RAM_TAG).set_default_size("64K");
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index 9fa38f11b1e..3fb7ead0559 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -27,7 +27,6 @@
#include "machine/ram.h"
#include "machine/timer.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
@@ -598,7 +597,6 @@ void tk2000_state::tk2000(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);
/* /INH banking */
ADDRESS_MAP_BANK(config, A2_UPPERBANK_TAG).set_map(&tk2000_state::inhbank_map).set_options(ENDIANNESS_LITTLE, 8, 32, 0x4000);
@@ -616,6 +614,7 @@ void tk2000_state::tk2000(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_default_state(CASSETTE_STOPPED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
CENTRONICS(config, m_printer, centronics_devices, nullptr);
m_printer->busy_handler().set(FUNC(tk2000_state::printer_busy_w));
diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp
index 2f07627f99c..cb1dc369546 100644
--- a/src/mame/drivers/tmc2000e.cpp
+++ b/src/mame/drivers/tmc2000e.cpp
@@ -34,7 +34,6 @@
#include "emu.h"
#include "includes/tmc2000e.h"
-#include "sound/wave.h"
#include "screen.h"
#include "speaker.h"
@@ -300,7 +299,6 @@ void tmc2000e_state::tmc2000e(machine_config &config)
// sound hardware
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
CDP1864(config, m_cti, 1.75_MHz_XTAL).set_screen(SCREEN_TAG);
m_cti->inlace_cb().set_constant(0);
m_cti->int_cb().set_inputline(m_maincpu, COSMAC_INPUT_LINE_INT);
@@ -314,6 +312,7 @@ void tmc2000e_state::tmc2000e(machine_config &config)
/* devices */
CASSETTE(config, 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("8K").set_extra_options("40K");
diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp
index 7fdc1b6a917..9f7167ef785 100644
--- a/src/mame/drivers/vector06.cpp
+++ b/src/mame/drivers/vector06.cpp
@@ -27,7 +27,6 @@ TODO:
#include "includes/vector06.h"
#include "formats/vector06_dsk.h"
-#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
#include "speaker.h"
@@ -181,7 +180,6 @@ void vector06_state::vector06(machine_config &config)
PALETTE(config, m_palette, palette_device::BLACK, 16);
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "mono", 0.05);
/* devices */
I8255(config, m_ppi8255);
@@ -198,6 +196,7 @@ void vector06_state::vector06(machine_config &config)
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);
KR1818VG93(config, m_fdc, 1_MHz_XTAL);
diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp
index 05f69a3da03..8663c4bc291 100644
--- a/src/mame/drivers/vg5k.cpp
+++ b/src/mame/drivers/vg5k.cpp
@@ -56,7 +56,6 @@
#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "sound/wave.h"
#include "video/ef9345.h"
#include "screen.h"
@@ -393,7 +392,6 @@ void vg5k_state::vg5k(machine_config &config)
/* sound hardware */
SPEAKER(config, "speaker").front_center();
- WAVE(config, "wave", m_cassette).add_route(0, "speaker", 0.05);
DAC_1BIT(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.125);
voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
@@ -402,6 +400,7 @@ void vg5k_state::vg5k(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(vg5k_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette->add_route(0, "speaker", 0.05);
m_cassette->set_interface("vg5k_cass");
/* printer */
diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp
index bd03f12bd08..33942f9508c 100644
--- a/src/mame/drivers/vtech1.cpp
+++ b/src/mame/drivers/vtech1.cpp
@@ -38,7 +38,6 @@ Todo:
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "sound/spkrdev.h"
-#include "sound/wave.h"
#include "video/mc6847.h"
#include "softlist.h"
@@ -446,7 +445,6 @@ void vtech1_state::laser110(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).set_levels(4, speaker_levels);
m_speaker->add_route(ALL_OUTPUTS, "mono", 0.75);
@@ -464,6 +462,7 @@ void vtech1_state::laser110(machine_config &config)
CASSETTE(config, m_cassette);
m_cassette->set_formats(vtech1_cassette_formats);
m_cassette->set_default_state(CASSETTE_STOPPED);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette->set_interface("vtech1_cass");
SOFTWARE_LIST(config, "cass_list").set_original("vz_cass");
diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp
index b0df97e13eb..ea13cbeef53 100644
--- a/src/mame/drivers/vtech2.cpp
+++ b/src/mame/drivers/vtech2.cpp
@@ -75,7 +75,6 @@
#include "emu.h"
#include "includes/vtech2.h"
#include "cpu/z80/z80.h"
-#include "sound/wave.h"
#include "formats/vt_cas.h"
#include "screen.h"
#include "speaker.h"
@@ -512,12 +511,12 @@ void vtech2_state::laser350(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.75);
CASSETTE(config, m_cassette);
m_cassette->set_formats(vtech2_cassette_formats);
m_cassette->set_default_state(CASSETTE_PLAY);
+ m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
VTECH_IOEXP_SLOT(config, "io").set_io_space(m_maincpu, AS_IO);
diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp
index ca5d744cb30..c3b033be782 100644
--- a/src/mame/drivers/z1013.cpp
+++ b/src/mame/drivers/z1013.cpp
@@ -54,7 +54,6 @@ Due to no input checking, misuse of commands can crash the system.
#include "machine/z80pio.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -392,7 +391,6 @@ void z1013_state::z1013(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
/* devices */
z80pio_device& pio(Z80PIO(config, "z80pio", XTAL(1'000'000)));
@@ -401,6 +399,7 @@ void z1013_state::z1013(machine_config &config)
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
SNAPSHOT(config, "snapshot", "z80").set_load_callback(FUNC(z1013_state::snapshot_cb), this);
}
diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp
index 9ed29aae555..f7f28d973ce 100644
--- a/src/mame/drivers/z80ne.cpp
+++ b/src/mame/drivers/z80ne.cpp
@@ -97,7 +97,6 @@
#include "formats/dmk_dsk.h"
#include "machine/ram.h"
#include "softlist.h"
-#include "sound/wave.h"
#include "speaker.h"
/* Layout */
@@ -432,18 +431,18 @@ void z80ne_state::z80ne(machine_config &config)
m_uart_clock->signal_handler().set(FUNC(z80ne_state::lx385_uart_tx_clock_w));
m_uart_clock->signal_handler().append(m_uart, FUNC(ay31015_device::write_rcp));
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cassette1);
m_cassette1->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette1->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette1->set_interface("z80ne_cass");
CASSETTE(config, m_cassette2);
m_cassette2->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette2->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette2->set_interface("z80ne_cass");
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave1", m_cassette1).add_route(ALL_OUTPUTS, "mono", 0.05);
- WAVE(config, "wave2", m_cassette2).add_route(ALL_OUTPUTS, "mono", 0.05);
-
config.set_default_layout(layout_z80ne);
/* internal ram */
@@ -513,18 +512,18 @@ void z80ne_state::z80netb(machine_config &config)
m_uart_clock->signal_handler().set(FUNC(z80ne_state::lx385_uart_tx_clock_w));
m_uart_clock->signal_handler().append(m_uart, FUNC(ay31015_device::write_rcp));
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cassette1);
m_cassette1->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette1->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette1->set_interface("z80ne_cass");
CASSETTE(config, m_cassette2);
m_cassette2->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette2->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette2->set_interface("z80ne_cass");
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave1", m_cassette1).add_route(ALL_OUTPUTS, "mono", 0.05);
- WAVE(config, "wave2", m_cassette2).add_route(ALL_OUTPUTS, "mono", 0.05);
-
lx387(config);
/* video hardware */
@@ -560,18 +559,18 @@ void z80netf_state::z80netf(machine_config &config)
m_uart_clock->signal_handler().set(FUNC(z80netf_state::lx385_uart_tx_clock_w));
m_uart_clock->signal_handler().append(m_uart, FUNC(ay31015_device::write_rcp));
+ SPEAKER(config, "mono").front_center();
+
CASSETTE(config, m_cassette1);
m_cassette1->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette1->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette1->set_interface("z80ne_cass");
CASSETTE(config, m_cassette2);
m_cassette2->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+ m_cassette2->add_route(ALL_OUTPUTS, "mono", 0.05);
m_cassette2->set_interface("z80ne_cass");
- SPEAKER(config, "mono").front_center();
- WAVE(config, "wave1", m_cassette1).add_route(ALL_OUTPUTS, "mono", 0.05);
- WAVE(config, "wave2", m_cassette2).add_route(ALL_OUTPUTS, "mono", 0.05);
-
lx387(config);
/* video hardware */
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index 18de37d924e..31d570d69e4 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -43,7 +43,6 @@ ToDo:
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "sound/beep.h"
-#include "sound/wave.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
@@ -237,7 +236,6 @@ void z9001_state::z9001(machine_config &config)
/* Sound */
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
BEEP(config, "beeper", 800).add_route(ALL_OUTPUTS, "mono", 0.50);
/* Devices */
@@ -258,6 +256,7 @@ void z9001_state::z9001(machine_config &config)
ctc.zc_callback<2>().set("ctc", FUNC(z80ctc_device::trg3));
CASSETTE(config, m_cass);
+ m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
}
/* ROM definition */