summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2019-06-30 23:54:38 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2019-06-30 23:54:38 +1000
commit66939696f1e68ec35964c3577b256131603fcc8a (patch)
tree05b6ff49dd0ed37cc84d4a87c6d1c7d17ffacef0
parent51c6e698d7cefaae4344cf7a71e5a6111fe345e9 (diff)
(nw) more cassette wav sound
-rw-r--r--src/mame/drivers/radio86.cpp2
-rw-r--r--src/mame/drivers/rc759.cpp2
-rw-r--r--src/mame/drivers/rm380z.cpp9
-rw-r--r--src/mame/drivers/rx78.cpp2
-rw-r--r--src/mame/drivers/samcoupe.cpp2
-rw-r--r--src/mame/drivers/shine.cpp14
-rw-r--r--src/mame/drivers/spc1500.cpp2
-rw-r--r--src/mame/drivers/special.cpp4
-rw-r--r--src/mame/drivers/spectrum.cpp2
9 files changed, 25 insertions, 14 deletions
diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp
index c66612c34f2..424c52560cd 100644
--- a/src/mame/drivers/radio86.cpp
+++ b/src/mame/drivers/radio86.cpp
@@ -488,7 +488,7 @@ 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.25);
+ 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));
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index a39303a15c6..7e99f3edd27 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -22,6 +22,7 @@
#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"
@@ -579,6 +580,7 @@ void rc759_state::rc759(machine_config &config)
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");
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index 7b648e24133..a6b0eba11e6 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -167,6 +167,8 @@ 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"
#include "screen.h"
@@ -256,9 +258,10 @@ void rm380z_state::rm380z(machine_config &config)
/* cassette */
CASSETTE(config, m_cassette);
-// m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED);
- m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED);
- //m_cassette->change_state((BIT(data,x)) ? CASSETTE_MOTOR_DISABLED : CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR);
+// 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);
/* 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 71acb964e4e..a668cc0ec3f 100644
--- a/src/mame/drivers/rx78.cpp
+++ b/src/mame/drivers/rx78.cpp
@@ -500,7 +500,7 @@ void rx78_state::rx78(machine_config &config)
SPEAKER(config, "mono").front_center();
- WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25);
+ 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
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index 720119e9f85..8693b99f834 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -31,6 +31,7 @@
#include "cpu/z80/z80.h"
#include "sound/saa1099.h"
+#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
@@ -545,6 +546,7 @@ void samcoupe_state::samcoupe(machine_config &config)
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 d5176110ac4..9c6e26a04a2 100644
--- a/src/mame/drivers/shine.cpp
+++ b/src/mame/drivers/shine.cpp
@@ -17,6 +17,7 @@
#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"
@@ -38,6 +39,7 @@ public:
, m_cassette(*this, "cassette")
, m_centronics(*this, "centronics")
, m_speaker(*this, "speaker")
+ , m_cass(*this, "cassette")
, m_irqs(*this, "irqs")
, m_y(*this, "Y%u", 0)
, m_video_ram(*this, "video_ram")
@@ -46,14 +48,14 @@ public:
virtual void machine_start() override;
void shine_mem(address_map &map);
+ void shine(machine_config &config);
+
+private:
DECLARE_READ8_MEMBER(via0_pa_r);
DECLARE_WRITE8_MEMBER(via0_pb_w);
DECLARE_WRITE8_MEMBER(floppy_w);
DECLARE_READ8_MEMBER(vdg_videoram_r);
- void shine(machine_config &config);
-
-private:
required_device<cpu_device> m_maincpu;
required_device<mc6847_base_device> m_vdg;
required_device<ram_device> m_ram;
@@ -63,6 +65,7 @@ private:
required_device<cassette_image_device> m_cassette;
required_device<centronics_device> m_centronics;
required_device<speaker_sound_device> m_speaker;
+ required_device<cassette_image_device> m_cass;
required_device<input_merger_device> m_irqs;
required_ioport_array<8> m_y;
required_shared_ptr<uint8_t> m_video_ram;
@@ -247,6 +250,7 @@ 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");
@@ -267,8 +271,8 @@ void shine_state::shine(machine_config &config)
FLOPPY_CONNECTOR(config, m_floppy[0], "525qd", FLOPPY_525_QD, true, floppy_image_device::default_floppy_formats).enable_sound(true);
FLOPPY_CONNECTOR(config, m_floppy[1], "525qd", FLOPPY_525_QD, false, floppy_image_device::default_floppy_formats).enable_sound(true);
- auto &cassette(CASSETTE(config, "cassette"));
- cassette.set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED);
+ CASSETTE(config, m_cass);
+ m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
}
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index 5cd11f64eef..7b9c5a41734 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -920,7 +920,7 @@ void spc1500_state::spc1500(machine_config &config)
m_sound->port_a_read_callback().set(FUNC(spc1500_state::psga_r));
m_sound->port_b_write_callback().set(FUNC(spc1500_state::psgb_w));
m_sound->add_route(ALL_OUTPUTS, "mono", 1.00);
- WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.25);
+ WAVE(config, "wave", m_cass).add_route(ALL_OUTPUTS, "mono", 0.05);
CENTRONICS(config, m_centronics, centronics_devices, "printer");
m_centronics->busy_handler().set(FUNC(spc1500_state::centronics_busy_w));
diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp
index ac625fa7cb5..d96f398d97f 100644
--- a/src/mame/drivers/special.cpp
+++ b/src/mame/drivers/special.cpp
@@ -389,7 +389,7 @@ void special_state::special(machine_config &config)
voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.25);
+ WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05);
/* Devices */
I8255(config, m_ppi);
@@ -502,7 +502,7 @@ void special_state::erik(machine_config &config)
voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
- WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.25);
+ WAVE(config, "wave", m_cassette).add_route(ALL_OUTPUTS, "speaker", 0.05);
/* Devices */
CASSETTE(config, m_cassette);
diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp
index 89b75d16749..f73df108b20 100644
--- a/src/mame/drivers/spectrum.cpp
+++ b/src/mame/drivers/spectrum.cpp
@@ -706,7 +706,7 @@ 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.25);
+ WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.05);
SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50);
/* expansion port */