Skip to content

Commit

Permalink
Bug fixes.
Browse files Browse the repository at this point in the history
* LSB in XG PLG preset section now works correctly.
* Voices under the XG PLG preset section now return the right two-letter category.
* Pitch bend transition time in Cambiare has been shortened from 50ms to 25ms.
* Added cc14, cc15, cc20 and cc21 to ACE candidates due to PLG-150VL.
  • Loading branch information
PoneyClairDeLune committed Oct 28, 2023
1 parent ac56385 commit d99023b
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 39 deletions.
22 changes: 11 additions & 11 deletions dist/cambiare.mjs

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions dist/state.mjs

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions dist/xp_basic.mjs

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions dist/xp_state.mjs

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions src/state/bankReader.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,18 @@ let VoiceBank = class {
break;
};
case 32: {
if (lsb > 125) {
args[2] = 0; // cc reset
};
args[2] += 4; // PLG-150AP redirection
break;
};
case 33:
case 35:
case 36: {
if (lsb > 125) {
args[2] = 0; // cc reset
};
args[2] += 5; // PLG-150VL/DX/AN redirection
break;
};
Expand Down Expand Up @@ -434,6 +440,17 @@ let VoiceBank = class {
};
break;
};
case 32:
case 33:
case 35:
case 36: {
if (args[2] > 4) {
standard = ["AP", "VL", "PF", "DX", "AN"][args[0] - 32];
} else {
standard = "GS";
};
break;
};
case 48: {
standard = "MU"; // MU-100 Native
break;
Expand Down
5 changes: 3 additions & 2 deletions src/state/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,10 @@ ccAccepted = [
92, 93, 94, 95, 98, 99, 100, 101,
128, // Dry level (internal register for Octavia)
12, 13, // General-purpose effect controllers
16, 17, 18, 19 // General-purpose sound controllers
16, 17, 18, 19, // General-purpose sound controllers
14, 15, 20, 21 // For some reason, used by PLG-150VL
], // 96, 97, 120 to 127 all have special functions
aceCandidates = [12, 13, 16, 17, 18, 19],
aceCandidates = [12, 13, 14, 15, 16, 17, 18, 19, 20, 21],
nrpnCcMap = [33, 99, 100, 32, 102, 8, 9, 10]; // cc71 to cc78

const korgDrums = [0, 16, 25, 40, 32, 64, 26, 48];
Expand Down
2 changes: 1 addition & 1 deletion test/css/cambiare.css
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ div.cambiare-canvas > div.sect-part div.part-keyboard {
margin: 0 calc(100% * 24 / 176);
}
div.cambiare-canvas:not(div.cambiare-style-line) > div.sect-part div.part-keyboard {
transition: 0.05s transform;
transition: 0.025s transform;
}
div.cambiare-canvas.cambiare-port4 > div.sect-part div.part-info-minor {
display: none;
Expand Down

0 comments on commit d99023b

Please sign in to comment.