Skip to content

Commit efbe742

Browse files
felipesanchesfelipesanches
committed
Fix lua handling of IPT_ADJUSTER range of 0-255.
1 parent 4030d23 commit efbe742

File tree

2 files changed

+61
-61
lines changed

2 files changed

+61
-61
lines changed

‎src/mame/layout/pg1000.lay‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ license:CC0-1.0
134134
</element>
135135
<element id="knob_~slider_id~" ref="slider_knob">
136136
<animate inputtag="~port_name~" inputmask="0x7f"/>
137-
<bounds state="100" x="2" y="7" width="25" height="20"/>
137+
<bounds state="255" x="2" y="7" width="25" height="20"/>
138138
<bounds state="0" x="2" y="100" width="25" height="20"/>
139139
</element>
140140
</group>
@@ -852,7 +852,7 @@ s
852852
853853
-- A slider is selected. Update state and, indirectly, slider knob position,
854854
-- based on the pointer's Y position. It is assumed the attached IO field is
855-
-- an IPT_ADJUSTER with a range of 0-100 (the default).
855+
-- an IPT_ADJUSTER with a range of 0-255.
856856
857857
local pointer = pointers[id]
858858
local slider = sliders[pointer.selected_slider]
@@ -865,16 +865,16 @@ s
865865
if pointer.relative then
866866
-- User clicked on the knob. The new value will depend on how much the
867867
-- knob was dragged.
868-
new_value = pointer.start_value - 100 * (y - pointer.start_y) / (max_y - min_y)
868+
new_value = pointer.start_value - 255 * (y - pointer.start_y) / (max_y - min_y)
869869
else
870870
-- User clicked elsewhere on the slider. The new value will depend on
871871
-- the absolute position of the click.
872-
new_value = 100 - 100 * (y - min_y) / (max_y - min_y)
872+
new_value = 255 - 255 * (y - min_y) / (max_y - min_y)
873873
end
874874
875875
new_value = math.floor(new_value + 0.5)
876876
if new_value < 0 then new_value = 0 end
877-
if new_value > 100 then new_value = 100 end
877+
if new_value > 255 then new_value = 255 end
878878
slider.field.user_value = new_value
879879
end
880880

‎src/mame/roland/roland_pg1000.cpp‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -279,98 +279,98 @@ void pg1000_state::pg1000(machine_config &config)
279279
m_maincpu->an0_func().set([this] { /* IC11 */
280280
switch(m_an_select)
281281
{
282-
case 7: return m_bottom_slider[1]->read() * 255 / 100; /* TVA: VELO */
283-
case 6: return m_bottom_slider[0]->read() * 255 / 100; /* TVA: LEVEL */
284-
case 5: return m_bottom_slider[2]->read() * 255 / 100; /* TVA: BIAS DIREC */
285-
case 4: return m_middle_slider[0]->read() * 255 / 100; /* TVF: CUTOFF FREQ */
286-
case 3: return m_middle_slider[4]->read() * 255 / 100; /* TVF: BIAS POINT */
287-
case 2: return m_middle_slider[1]->read() * 255 / 100; /* TVF: RESO */
288-
case 1: return m_middle_slider[2]->read() * 255 / 100; /* TVF: KF */
289-
case 0: return m_middle_slider[3]->read() * 255 / 100; /* TVF: BIAS DIREC */
282+
case 7: return m_bottom_slider[1]->read(); /* TVA: VELO */
283+
case 6: return m_bottom_slider[0]->read(); /* TVA: LEVEL */
284+
case 5: return m_bottom_slider[2]->read(); /* TVA: BIAS DIREC */
285+
case 4: return m_middle_slider[0]->read(); /* TVF: CUTOFF FREQ */
286+
case 3: return m_middle_slider[4]->read(); /* TVF: BIAS POINT */
287+
case 2: return m_middle_slider[1]->read(); /* TVF: RESO */
288+
case 1: return m_middle_slider[2]->read(); /* TVF: KF */
289+
case 0: return m_middle_slider[3]->read(); /* TVF: BIAS DIREC */
290290
}
291291
return (unsigned int) 0xff; // std::unreachable();
292292
});
293293
m_maincpu->an1_func().set([this] { /* IC14 */
294294
switch(m_an_select)
295295
{
296-
case 7: return m_bottom_slider[13]->read() * 255 / 100; /* TVF ENV: DKF */
297-
case 6: return m_bottom_slider[12]->read() * 255 / 100; /* TVF ENV: END L */
298-
case 5: return m_bottom_slider[14]->read() * 255 / 100; /* TVA ENV: L1 */
299-
case 4: return m_bottom_slider[11]->read() * 255 / 100; /* TVF ENV: SUS L */
300-
case 3: return m_middle_slider[17]->read() * 255 / 100; /* TVA ENV: T1 */
301-
case 2: return m_middle_slider[14]->read() * 255 / 100; /* TVF ENV: T4 */
302-
case 1: return m_middle_slider[15]->read() * 255 / 100; /* TVF ENV: T5 */
303-
case 0: return m_middle_slider[16]->read() * 255 / 100; /* TVF ENV: TKF */
296+
case 7: return m_bottom_slider[13]->read(); /* TVF ENV: DKF */
297+
case 6: return m_bottom_slider[12]->read(); /* TVF ENV: END L */
298+
case 5: return m_bottom_slider[14]->read(); /* TVA ENV: L1 */
299+
case 4: return m_bottom_slider[11]->read(); /* TVF ENV: SUS L */
300+
case 3: return m_middle_slider[17]->read(); /* TVA ENV: T1 */
301+
case 2: return m_middle_slider[14]->read(); /* TVF ENV: T4 */
302+
case 1: return m_middle_slider[15]->read(); /* TVF ENV: T5 */
303+
case 0: return m_middle_slider[16]->read(); /* TVF ENV: TKF */
304304
}
305305
return (unsigned int) 0xff; // std::unreachable();
306306
});
307307
m_maincpu->an2_func().set([this] { /* IC8 */
308308
switch(m_an_select)
309309
{
310-
case 7: return m_top_slider[12]->read() * 255 / 100; /* WG WAVEFORM: PCM */
311-
case 6: return m_middle_slider[22]->read() * 255 / 100; /* TVA ENV: TKF */
312-
case 5: return m_top_slider[11]->read() * 255 / 100; /* WG WAVEFORM: PWM DEPTH */
313-
case 4: return m_middle_slider[21]->read() * 255 / 100; /* TVA ENV: T5 */
314-
case 3: return m_top_slider[10]->read() * 255 / 100; /* WG WAVEFORM: PWM LFO SEL */
315-
case 2: return m_top_slider[7]->read() * 255 / 100; /* WG WAVEFORM: PW */
316-
case 1: return m_top_slider[8]->read() * 255 / 100; /* WG WAVEFORM: PW VELO */
317-
case 0: return m_top_slider[9]->read() * 255 / 100; /* WG WAVEFORM: PW AFTER */
310+
case 7: return m_top_slider[12]->read(); /* WG WAVEFORM: PCM */
311+
case 6: return m_middle_slider[22]->read(); /* TVA ENV: TKF */
312+
case 5: return m_top_slider[11]->read(); /* WG WAVEFORM: PWM DEPTH */
313+
case 4: return m_middle_slider[21]->read(); /* TVA ENV: T5 */
314+
case 3: return m_top_slider[10]->read(); /* WG WAVEFORM: PWM LFO SEL */
315+
case 2: return m_top_slider[7]->read(); /* WG WAVEFORM: PW */
316+
case 1: return m_top_slider[8]->read(); /* WG WAVEFORM: PW VELO */
317+
case 0: return m_top_slider[9]->read(); /* WG WAVEFORM: PW AFTER */
318318
}
319319
return (unsigned int) 0xff; // std::unreachable();
320320
});
321321
m_maincpu->an3_func().set([this] { /* IC13 */
322322
switch(m_an_select)
323323
{
324-
case 7: return m_bottom_slider[9]->read() * 255 / 100; /* TVF ENV: L2 */
325-
case 6: return m_bottom_slider[8]->read() * 255 / 100; /* TVF ENV: L1 */
326-
case 5: return m_bottom_slider[10]->read() * 255 / 100; /* TVF ENV: L3 */
327-
case 4: return m_bottom_slider[7]->read() * 255 / 100; /* TVA: AFTER RANGE */
328-
case 3: return m_middle_slider[13]->read() * 255 / 100; /* TVF ENV: T3 */
329-
case 2: return m_middle_slider[9]->read() * 255 / 100; /* TVF: LFO DEPTH */
330-
case 1: return m_middle_slider[10]->read() * 255 / 100; /* TVF: AFTER RANGE */
331-
case 0: return m_middle_slider[11]->read() * 255 / 100; /* TVF ENV: T1 */
324+
case 7: return m_bottom_slider[9]->read(); /* TVF ENV: L2 */
325+
case 6: return m_bottom_slider[8]->read(); /* TVF ENV: L1 */
326+
case 5: return m_bottom_slider[10]->read(); /* TVF ENV: L3 */
327+
case 4: return m_bottom_slider[7]->read(); /* TVA: AFTER RANGE */
328+
case 3: return m_middle_slider[13]->read(); /* TVF ENV: T3 */
329+
case 2: return m_middle_slider[9]->read(); /* TVF: LFO DEPTH */
330+
case 1: return m_middle_slider[10]->read(); /* TVF: AFTER RANGE */
331+
case 0: return m_middle_slider[11]->read(); /* TVF ENV: T1 */
332332
}
333333
return (unsigned int) 0xff; // std::unreachable();
334334
});
335335
m_maincpu->an4_func().set([this] { /* IC9 */
336336
switch(m_an_select)
337337
{
338-
case 7: return m_top_slider[0]->read() * 255 / 100; /* WG PITCH: COARSE */
339-
case 6: return m_top_slider[1]->read() * 255 / 100; /* WG PITCH: FINE */
340-
case 5: return m_middle_slider[12]->read() * 255 / 100; /* TVF ENV: T2 */
341-
case 4: return m_top_slider[2]->read() * 255 / 100; /* WG PITCH: KF */
342-
case 3: return m_top_slider[6]->read() * 255 / 100; /* WG WAVEFORM: WF */
343-
case 2: return m_top_slider[3]->read() * 255 / 100; /* WG PITCH: LFO MODE */
344-
case 1: return m_top_slider[4]->read() * 255 / 100; /* WG PITCH: ENV MODE */
345-
case 0: return m_top_slider[5]->read() * 255 / 100; /* WG PITCH: BEND MODE */
338+
case 7: return m_top_slider[0]->read(); /* WG PITCH: COARSE */
339+
case 6: return m_top_slider[1]->read(); /* WG PITCH: FINE */
340+
case 5: return m_middle_slider[12]->read(); /* TVF ENV: T2 */
341+
case 4: return m_top_slider[2]->read(); /* WG PITCH: KF */
342+
case 3: return m_top_slider[6]->read(); /* WG WAVEFORM: WF */
343+
case 2: return m_top_slider[3]->read(); /* WG PITCH: LFO MODE */
344+
case 1: return m_top_slider[4]->read(); /* WG PITCH: ENV MODE */
345+
case 0: return m_top_slider[5]->read(); /* WG PITCH: BEND MODE */
346346
}
347347
return (unsigned int) 0xff; // std::unreachable();
348348
});
349349
m_maincpu->an5_func().set([this] { /* IC12 */
350350
switch(m_an_select)
351351
{
352-
case 7: return m_bottom_slider[5]->read() * 255 / 100; /* TVA: LFO SELECT */
353-
case 6: return m_bottom_slider[4]->read() * 255 / 100; /* TVA: BIAS LEVEL */
354-
case 5: return m_bottom_slider[6]->read() * 255 / 100; /* TVA: LFO DEPTH */
355-
case 4: return m_bottom_slider[3]->read() * 255 / 100; /* TVA: BIAS POINT */
356-
case 3: return m_middle_slider[8]->read() * 255 / 100; /* TVF: LFO SELECT */
357-
case 2: return m_middle_slider[5]->read() * 255 / 100; /* TVF: BIAS LEVEL */
358-
case 1: return m_middle_slider[6]->read() * 255 / 100; /* TVF: ENV DEPTH */
359-
case 0: return m_middle_slider[7]->read() * 255 / 100; /* TVF: ENV VELO */
352+
case 7: return m_bottom_slider[5]->read(); /* TVA: LFO SELECT */
353+
case 6: return m_bottom_slider[4]->read(); /* TVA: BIAS LEVEL */
354+
case 5: return m_bottom_slider[6]->read(); /* TVA: LFO DEPTH */
355+
case 4: return m_bottom_slider[3]->read(); /* TVA: BIAS POINT */
356+
case 3: return m_middle_slider[8]->read(); /* TVF: LFO SELECT */
357+
case 2: return m_middle_slider[5]->read(); /* TVF: BIAS LEVEL */
358+
case 1: return m_middle_slider[6]->read(); /* TVF: ENV DEPTH */
359+
case 0: return m_middle_slider[7]->read(); /* TVF: ENV VELO */
360360
}
361361
return (unsigned int) 0xff; // std::unreachable();
362362
});
363363
m_maincpu->an6_func().set([this] { /* IC15 */
364364
switch(m_an_select)
365365
{
366-
case 7: return m_bottom_slider[17]->read() * 255 / 100; /* TVA ENV: SUS L */
367-
case 6: return m_bottom_slider[16]->read() * 255 / 100; /* TVA ENV: L3 */
368-
case 5: return m_bottom_slider[18]->read() * 255 / 100; /* TVA ENV: END L */
369-
case 4: return m_bottom_slider[15]->read() * 255 / 100; /* TVA ENV: L2 */
370-
case 3: return m_bottom_slider[19]->read() * 255 / 100; /* TVA ENV: T1 VELO */
371-
case 2: return m_middle_slider[18]->read() * 255 / 100; /* TVA ENV: T2 */
372-
case 1: return m_middle_slider[19]->read() * 255 / 100; /* TVA ENV: T3 */
373-
case 0: return m_middle_slider[20]->read() * 255 / 100; /* TVA ENV: T4 */
366+
case 7: return m_bottom_slider[17]->read(); /* TVA ENV: SUS L */
367+
case 6: return m_bottom_slider[16]->read(); /* TVA ENV: L3 */
368+
case 5: return m_bottom_slider[18]->read(); /* TVA ENV: END L */
369+
case 4: return m_bottom_slider[15]->read(); /* TVA ENV: L2 */
370+
case 3: return m_bottom_slider[19]->read(); /* TVA ENV: T1 VELO */
371+
case 2: return m_middle_slider[18]->read(); /* TVA ENV: T2 */
372+
case 1: return m_middle_slider[19]->read(); /* TVA ENV: T3 */
373+
case 0: return m_middle_slider[20]->read(); /* TVA ENV: T4 */
374374
}
375375
return (unsigned int) 0xff; // std::unreachable();
376376
});

0 commit comments

Comments
 (0)