stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6823445: Gervill SoftChannel/ResetAllControllers jtreg test fails after portamento fix from last merge

Browse Source 
Reviewed-by: amenkov
This commit is contained in:
Karl Helgason 2009-04-17 16:20:50 +04:00
parent b136abc344
commit 2f6783dce5
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jdk/src/share/classes/com/sun/media/sound/SoftChannel.java
View File

@ -67,7 +67,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
dontResetControls[77] = true; // Sound Controller 8 (GM2 default: Vibrato Depth) dontResetControls[77] = true; // Sound Controller 8 (GM2 default: Vibrato Depth)
dontResetControls[78] = true; // Sound Controller 9 (GM2 default: Vibrato Delay) dontResetControls[78] = true; // Sound Controller 9 (GM2 default: Vibrato Delay)
dontResetControls[79] = true; // Sound Controller 10 (GM2 default: Undefined) dontResetControls[79] = true; // Sound Controller 10 (GM2 default: Undefined)
dontResetControls[84] = true; // Portamento Controller
dontResetControls[120] = true; // All Sound Off dontResetControls[120] = true; // All Sound Off
dontResetControls[121] = true; // Reset All Controllers dontResetControls[121] = true; // Reset All Controllers
dontResetControls[122] = true; // Local Control On/Off dontResetControls[122] = true; // Local Control On/Off
@ -94,7 +93,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
protected double portamento_time = 1; // keyschanges per control buffer time protected double portamento_time = 1; // keyschanges per control buffer time
protected int[] portamento_lastnote = new int[128]; protected int[] portamento_lastnote = new int[128];
protected int portamento_lastnote_ix = 0; protected int portamento_lastnote_ix = 0;
private int portamento_control_note = -1;
private boolean portamento = false; private boolean portamento = false;
private boolean mono = false; private boolean mono = false;
private boolean mute = false; private boolean mute = false;
@ -370,12 +368,12 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
voice.setSoloMute(solomute); voice.setSoloMute(solomute);
if (releaseTriggered) if (releaseTriggered)
return; return;
if (portamento_control_note != -1) { if (controller[84] != 0) {
voice.co_noteon_keynumber[0] voice.co_noteon_keynumber[0]
= (tuning.getTuning(portamento_control_note) / 100.0) = (tuning.getTuning(controller[84]) / 100.0)
* (1f / 128f); * (1f / 128f);
voice.portamento = true; voice.portamento = true;
portamento_control_note = -1; controlChange(84, 0);
} else if (portamento) { } else if (portamento) {
if (mono) { if (mono) {
if (portamento_lastnote[0] != -1) { if (portamento_lastnote[0] != -1) {
@ -383,7 +381,7 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
= (tuning.getTuning(portamento_lastnote[0]) / 100.0) = (tuning.getTuning(portamento_lastnote[0]) / 100.0)
* (1f / 128f); * (1f / 128f);
voice.portamento = true; voice.portamento = true;
portamento_control_note = -1; controlChange(84, 0);
} }
portamento_lastnote[0] = noteNumber; portamento_lastnote[0] = noteNumber;
} else { } else {
@ -450,19 +448,19 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
} }
} }
if (portamento_control_note != -1) { if (controller[84] != 0) {
boolean n_found = false; boolean n_found = false;
for (int i = 0; i < voices.length; i++) { for (int i = 0; i < voices.length; i++) {
if (voices[i].on && voices[i].channel == channel if (voices[i].on && voices[i].channel == channel
&& voices[i].active && voices[i].active
&& voices[i].note == portamento_control_note && voices[i].note == controller[84]
&& voices[i].releaseTriggered == false) { && voices[i].releaseTriggered == false) {
voices[i].portamento = true; voices[i].portamento = true;
voices[i].setNote(noteNumber); voices[i].setNote(noteNumber);
n_found = true; n_found = true;
} }
} }
portamento_control_note = -1; controlChange(84, 0);
if (n_found) if (n_found)
return; return;
} }
@ -1154,9 +1152,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
} }
} }
break; break;
case 84:
portamento_control_note = value;
break;
case 98: case 98:
nrpn_control = (nrpn_control & (127 << 7)) + value; nrpn_control = (nrpn_control & (127 << 7)) + value;
rpn_control = RPN_NULL_VALUE; rpn_control = RPN_NULL_VALUE;
@ -1398,10 +1393,6 @@ public class SoftChannel implements MidiChannel, ModelDirectedPlayer {
controlChange(i, 0); controlChange(i, 0);
} }
// Portamento Controller (0x54) has to reset
// to -1 which mean that Portamento Controller is off
portamento_control_note = -1;
controlChange(71, 64); // Filter Resonance controlChange(71, 64); // Filter Resonance
controlChange(72, 64); // Release Time controlChange(72, 64); // Release Time
controlChange(73, 64); // Attack Time controlChange(73, 64); // Attack Time