summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-10-05 12:32:36 +1000
committer Vas Crabb <vas@vastheman.com>2019-10-05 12:32:36 +1000
commitd672b349122f9b3a93d2bea377f3e87470bfae4e (patch)
treedcd154bb6dc179c37054689f0418250a2e918ace
parent6f4ac66784bb7841154b8cb3aae2d416116ac10a (diff)
'subwoofer' does not describe a position (nw)
-rw-r--r--src/emu/speaker.h19
-rw-r--r--src/mame/audio/dcs.cpp6
-rw-r--r--src/mame/drivers/namcos22.cpp6
-rw-r--r--src/mame/drivers/taito_z.cpp6
-rw-r--r--src/mame/drivers/taitojc.cpp2
5 files changed, 22 insertions, 17 deletions
diff --git a/src/emu/speaker.h b/src/emu/speaker.h
index 47ad0f6b7d2..e4f62fb4661 100644
--- a/src/emu/speaker.h
+++ b/src/emu/speaker.h
@@ -55,13 +55,18 @@ public:
// inline configuration helpers
speaker_device &set_position(double x, double y, double z) { m_x = x; m_y = y; m_z = z; return *this; }
- speaker_device &front_center() { set_position(0.0, 0.0, 1.0); return *this; }
- speaker_device &front_left() { set_position(-0.2, 0.0, 1.0); return *this; }
- speaker_device &front_right() { set_position(0.2, 0.0, 1.0); return *this; }
- speaker_device &rear_center() { set_position(0.0, 0.0, -0.5); return *this; }
- speaker_device &rear_left() { set_position(-0.2, 0.0, -0.5); return *this; }
- speaker_device &rear_right() { set_position(0.2, 0.0, -0.5); return *this; }
- speaker_device &subwoofer() { set_position(0.0, 0.0, 0.0); return *this; }
+ speaker_device &front_center() { set_position( 0.0, 0.0, 1.0); return *this; }
+ speaker_device &front_left() { set_position(-0.2, 0.0, 1.0); return *this; }
+ speaker_device &front_floor() { set_position( 0.0, -0.5, 1.0); return *this; }
+ speaker_device &front_right() { set_position( 0.2, 0.0, 1.0); return *this; }
+ speaker_device &rear_center() { set_position( 0.0, 0.0, -0.5); return *this; }
+ speaker_device &rear_left() { set_position(-0.2, 0.0, -0.5); return *this; }
+ speaker_device &rear_right() { set_position( 0.2, 0.0, -0.5); return *this; }
+ speaker_device &headrest_center() { set_position( 0.0, 0.0, -0.1); return *this; }
+ speaker_device &headrest_left() { set_position(-0.1, 0.0, -0.1); return *this; }
+ speaker_device &headrest_right() { set_position( 0.1, 0.0, -0.1); return *this; }
+ speaker_device &seat() { set_position( 0.0, -0.5, 0.0); return *this; }
+ speaker_device &backrest() { set_position( 0.0, -0.2, 0.1); return *this; }
// internally for use by the sound system
void mix(s32 *leftmix, s32 *rightmix, int &samples_this_update, bool suppress);
diff --git a/src/mame/audio/dcs.cpp b/src/mame/audio/dcs.cpp
index 289f334eae2..da0ac4c6c5b 100644
--- a/src/mame/audio/dcs.cpp
+++ b/src/mame/audio/dcs.cpp
@@ -2720,9 +2720,9 @@ void dcs2_audio_denver_5ch_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "flspeaker").front_left();
SPEAKER(config, "frspeaker").front_right();
- SPEAKER(config, "rlspeaker").rear_left();
- SPEAKER(config, "rrspeaker").rear_right();
- SPEAKER(config, "subwoofer").subwoofer();
+ SPEAKER(config, "rlspeaker").headrest_left();
+ SPEAKER(config, "rrspeaker").headrest_right();
+ SPEAKER(config, "subwoofer").backrest();
DMADAC(config, "dac1").add_route(ALL_OUTPUTS, "flspeaker", 1.0);
DMADAC(config, "dac2").add_route(ALL_OUTPUTS, "frspeaker", 1.0);
diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp
index 23e472cadd2..611e762494b 100644
--- a/src/mame/drivers/namcos22.cpp
+++ b/src/mame/drivers/namcos22.cpp
@@ -3966,7 +3966,7 @@ void namcos22s_state::airco22b(machine_config &config)
{
namcos22s(config);
- SPEAKER(config, "bodysonic").subwoofer();
+ SPEAKER(config, "bodysonic").backrest(); // FIXME: is this seat or backrest?
m_c352->add_route(2, "bodysonic", 0.50); // to subwoofer
}
@@ -4016,8 +4016,8 @@ void namcos22s_state::tokyowar(machine_config &config)
{
namcos22s(config);
- SPEAKER(config, "vibration").subwoofer();
- SPEAKER(config, "seat").rear_center();
+ SPEAKER(config, "vibration").seat();
+ SPEAKER(config, "seat").headrest_center();
m_c352->add_route(2, "vibration", 0.50); // to "bass shaker"
m_c352->add_route(3, "seat", 1.00);
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index ea00979d01c..66cec60baa2 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -3181,7 +3181,7 @@ void taitoz_state::contcirc(machine_config &config)
/* sound hardware */
SPEAKER(config, "front").front_center();
SPEAKER(config, "rear").rear_center();
- SPEAKER(config, "subwoofer").subwoofer();
+ SPEAKER(config, "subwoofer").set_position(0.0, 0.0, 0.0); // FIXME: where is this speaker located?
ym2610_device &ymsnd(YM2610(config, "ymsnd", 16000000/2));
ymsnd.irq_handler().set_inputline(m_audiocpu, 0);
@@ -3248,7 +3248,7 @@ void taitoz_state::chasehq(machine_config &config)
/* sound hardware */
SPEAKER(config, "front").front_center();
SPEAKER(config, "rear").rear_center();
- SPEAKER(config, "subwoofer").subwoofer();
+ SPEAKER(config, "subwoofer").set_position(0.0, 0.0, 0.0); // FIXME: where is this speaker located?
ym2610_device &ymsnd(YM2610(config, "ymsnd", 16000000/2));
ymsnd.irq_handler().set_inputline(m_audiocpu, 0);
@@ -3533,7 +3533,7 @@ void taitoz_state::nightstr(machine_config &config)
/* sound hardware */
SPEAKER(config, "front").front_center();
SPEAKER(config, "rear").rear_center();
- SPEAKER(config, "subwoofer").subwoofer();
+ SPEAKER(config, "subwoofer").set_position(0.0, 0.0, 0.0); // FIXME: where is this located in the cabinet?
ym2610_device &ymsnd(YM2610(config, "ymsnd", 16000000/2));
ymsnd.irq_handler().set_inputline(m_audiocpu, 0);
diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp
index 2699ff36ef8..4dae09011b9 100644
--- a/src/mame/drivers/taitojc.cpp
+++ b/src/mame/drivers/taitojc.cpp
@@ -1139,7 +1139,7 @@ void taitojc_state::dendego(machine_config &config)
m_screen->set_screen_update(FUNC(taitojc_state::screen_update_dendego));
/* sound hardware */
- SPEAKER(config, "vibration").subwoofer();
+ SPEAKER(config, "vibration").seat();
/* clock frequency & pin 7 not verified */
OKIM6295(config, "oki", 1056000, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "vibration", 0.20);