From 556017b60f2176ae878086e725b0f579817edd46 Mon Sep 17 00:00:00 2001
From: m1macrophage <168948267+m1macrophage@users.noreply.github.com>
Date: Fri, 24 Jan 2025 02:53:08 -0800
Subject: oberheim/dmx.cpp: Surfacing mouse-controlled tunning trimmers on the
layout. (#13266)
Also made slider script and the sliders in the layout more reusable.
---
src/mame/layout/oberheim_dmx.lay | 174 +++++++++++++++++++++++----------------
src/mame/oberheim/dmx.cpp | 24 +++---
2 files changed, 117 insertions(+), 81 deletions(-)
diff --git a/src/mame/layout/oberheim_dmx.lay b/src/mame/layout/oberheim_dmx.lay
index 9a669dde2d0..a1521c7cb2f 100644
--- a/src/mame/layout/oberheim_dmx.lay
+++ b/src/mame/layout/oberheim_dmx.lay
@@ -20,6 +20,14 @@ copyright-holders:m1macrophage
+
+
+
+
+
+
+
+
@@ -75,6 +83,28 @@ copyright-holders:m1macrophage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -86,18 +116,26 @@ copyright-holders:m1macrophage
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -125,14 +163,14 @@ copyright-holders:m1macrophage
+
+
+
-
-
-
@@ -292,7 +330,7 @@ copyright-holders:m1macrophage
-
+
@@ -317,38 +355,35 @@ copyright-holders:m1macrophage
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
@@ -506,26 +541,22 @@ copyright-holders:m1macrophage
diff --git a/src/mame/oberheim/dmx.cpp b/src/mame/oberheim/dmx.cpp
index 5080a240b40..5e513563f20 100644
--- a/src/mame/oberheim/dmx.cpp
+++ b/src/mame/oberheim/dmx.cpp
@@ -62,7 +62,7 @@ Usage notes:
- Interactive layout included.
- The mixer faders can be controlled with the mouse, or from the "Slider
Controls" menu.
-- Voices can be tuned using the "Sider Controls" menu.
+- Voices can be tuned with the mouse, or the "Sider Controls" menu.
- The drum keys are mapped to the keyboard, starting at "Q". Specifically:
Q - Bass 1, W - Snare 1, ...
A - Bass 2, S - Snare 2, ...
@@ -1574,37 +1574,37 @@ INPUT_PORTS_START(dmx)
// Tunning potentiomenters. One per voice card, designated as T1 and labeled
// as "PITCH ADJ."
- PORT_START("pitch_adj_0")
+ PORT_START("pitch_adj_1")
PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "BASS pitch")
PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_BASS)
- PORT_START("pitch_adj_1")
+ PORT_START("pitch_adj_2")
PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "SNARE pitch")
PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_SNARE)
- PORT_START("pitch_adj_2")
+ PORT_START("pitch_adj_3")
PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "HI-HAT pitch")
PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_HIHAT)
- PORT_START("pitch_adj_3")
+ PORT_START("pitch_adj_4")
PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "TOM1 pitch")
PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_SMALL_TOMS)
- PORT_START("pitch_adj_4")
+ PORT_START("pitch_adj_5")
PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "TOM2 pitch")
PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_LARGE_TOMS)
- PORT_START("pitch_adj_5")
+ PORT_START("pitch_adj_6")
+ PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "CYMBAL pitch")
+ PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_CYMBAL)
+
+ PORT_START("pitch_adj_7")
PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "PERC1 pitch")
PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_PERC1)
- PORT_START("pitch_adj_6")
+ PORT_START("pitch_adj_8")
PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "PERC2 pitch")
PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_PERC2)
-
- PORT_START("pitch_adj_7")
- PORT_ADJUSTER(dmx_voice_card::T1_DEFAULT_PERCENT, "CYMBAL pitch")
- PORT_CHANGED_MEMBER(DEVICE_SELF, FUNC(dmx_state::pitch_adj_changed), dmx_state::VC_CYMBAL)
INPUT_PORTS_END
ROM_START(obdmx)
--
cgit v1.2.3