Skip to content

Commit 04c1997

Browse files
Supported voice level retrieval from banks.
1 parent 673618b commit 04c1997

File tree

5 files changed

+97
-4
lines changed

5 files changed

+97
-4
lines changed

data/map/xg.10.tsv

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,12 +497,51 @@ Rev.Kick Rev. Kick
497497
RConBaDr RvConBaDrm
498498
Rev. Tom ReverseTom
499499
Rev.Tom2 Rev. Tom 2
500+
MtdClavi MutedClavi
501+
DstnFire DistntFire
502+
Lightnin Lightning
503+
TinKettl Tin Kettle
500504
BlineHrd Hard Bline
505+
TnglCaos TinglChaos
506+
VanAllen Van Allen
507+
BlowNoiz Blow Noise
508+
K/S Ana. K/S Analog
509+
Monastry Monastery
510+
Incontnc Incontince
501511
Prcesion Precession
512+
K/S Hum. K/S Humid
513+
IncntClk IncntClick
502514
RndmWalk RandomWalk
515+
Lust St. StereoLust
516+
K/S Slap Kk/Sn Slap
517+
CheapOsc CheapOsci.
503518
RandmRun Random Run
519+
SoftHit+ Soft Hit +
520+
Rvr/Crsh Rev./Crash
521+
NastyCut Nasty Cut
522+
CheapOc+ CheapOsci+
523+
CalcOrg1 CalcOrgan1
524+
NstyCtSt NastyCutSt
504525
NstOrSpl NastyOrSpl
526+
CalcOrg2 CalcOrgan2
527+
Xe Xenon
528+
SprClick SuperClick
529+
CalcOrg3 CalcOrgan3
530+
Ruin St. StereoRuin
531+
OrganHit Organ Hit
532+
ChoCalcO ChorCalcOr
505533
Malfnctn Malfnction
534+
OrgnHit+ Organ Hit+
535+
ChoirSpl SplitChoir
536+
UnvrsSwp UniversSwp
537+
VaporVox VaporVoice
538+
Xe + Xenon +
539+
VoxShoot VoiceShoot
540+
SemiacOr SemiAcouOr
541+
Refusal+ Refusal +
542+
EnvyShrt Short Envy
543+
DoubtDbl DoublDoubt
544+
Glocken+ Glocken +
506545
CutNoise Cut Noise
507546
CutNoiz2 CutNoise 2
508547
DstCutNz DstCutNoiz

data/map/xg.12.tsv

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,36 @@ Rev.Kick Reverse Kick
395395
RConBaDr RevConBaDrum
396396
Rev. Tom Reverse Tom
397397
Rev.Tom2 ReverseTom 2
398+
MtdClavi Muted Clavi.
399+
DstnFire Distant Fire
400+
BlineHrd Hard Beeline
401+
TnglCaos Tingle&Chaos
402+
K/S Ana. Kk/Sn Analog
403+
K/S Hum. Kk/Sn Humid
404+
IncntClk IncontiClick
398405
RndmWalk Random Walk
399-
NstOrSpl NastyOrSplit
406+
Lust St. Stereo Lust
407+
K/S Slap Kik/Snr Slap
408+
CheapOsc Cheap Oscil.
409+
Rvr/Crsh Rev. / Crash
410+
CheapOc+ Cheap Oscil+
411+
CalcOrg1 Calc Organ 1
412+
NstyCtSt St.Nasty Cut
413+
NstOrSpl SplitNastyOr
414+
CalcOrg2 Calc Organ 2
415+
SprClick Super Click
416+
CalcOrg3 Calc Organ 3
417+
Ruin St. Stereo Ruin
418+
ChoCalcO ChorusCalcOr
400419
Malfnctn Malfunction
420+
OrgnHit+ Organ Hit +
421+
ChoirSpl Split Choir
422+
UnvrsSwp Universe Swp
423+
VaporVox Vapour Voice
424+
VoxShoot Voice Shoot
425+
SemiacOr SemiAcouOrgn
426+
DoubtDbl Double Doubt
427+
Glocken+ Glocknspiel+
401428
CutNoiz2 Cut Noise 2
402429
DstCutNz DistCutNoise
403430
Str.Slap String Slap

data/map/xg.24.tsv

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,21 @@ RevSnare Reverse Snare
307307
RvSnare2 Reverse Snare 2
308308
RConBaDr Rev. Concert Bass Drum
309309
Rev.Tom2 Reverse Tom 2
310+
MtdClavi Muted Clavinet
310311
Voodoo Voodoo Drums
312+
TnglCaos Tingle & Chaos
313+
K/S Ana. Analog Kick / Snare
314+
K/S Hum. Humid Kick / Snare
315+
IncntClk Incontience Click
316+
K/S Slap Slap Kick / Snare
317+
CheapOsc Cheap Oscillator
318+
Rvr/Crsh Reverse / Crash
319+
CheapOc+ Cheap Oscillator +
320+
NstyCtSt Stereo Nasty Cut
311321
NstOrSpl Split Nasty Organ
322+
ChoCalcO Chorus Calc Organ
323+
UnvrsSwp Universe Sweep
324+
SemiacOr Semi Acoustic Organ
312325
Glocken+ Glockenspiel +
313326
CutNoise Cutting Noise
314327
CutNoiz2 Cutting Noise 2

src/basic/index.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,10 @@ let RootDisplay = class extends CustomEventSource {
379379
getTempo() {
380380
return this.#noteTempo;
381381
};
382+
eachVoice(iter) {
383+
let upThis = this;
384+
upThis.#voiceCache.forEach(iter);
385+
};
382386
sendCmd(raw) {
383387
this.device.runJson(raw);
384388
};

src/state/bankReader.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let VoiceBank = class {
2929
get(msb = 0, prg = 0, lsb = 0, mode) {
3030
let sid = [msb, prg, lsb];
3131
let bankName;
32-
let bankPoly = 1, bankType = 0, bankDrum;
32+
let bankPoly = 1, bankType = 0, bankDrum, bankLevel;
3333
let args = Array.from(arguments);
3434
switch (mode) {
3535
case "xg": {
@@ -426,6 +426,7 @@ let VoiceBank = class {
426426
bankPoly = bankObject?.poly || bankPoly;
427427
bankType = bankObject?.type || bankType;
428428
bankDrum = bankObject?.drum;
429+
bankLevel = bankObject?.level;
429430
} else {
430431
if (!this.strictMode) {
431432
/* if (mode != "gs" && mode != "ns5r") {
@@ -480,6 +481,7 @@ let VoiceBank = class {
480481
bankPoly = bankObject?.poly || bankPoly;
481482
bankType = bankObject?.type || bankType;
482483
bankDrum = bankObject?.drum;
484+
bankLevel = bankObject?.level;
483485
} else {
484486
bankName = "";
485487
ending = "*";
@@ -683,6 +685,7 @@ let VoiceBank = class {
683685
poly: bankPoly,
684686
type: bankType,
685687
drum: bankDrum,
688+
level: bankLevel,
686689
iid,
687690
eid,
688691
sid,
@@ -709,7 +712,7 @@ let VoiceBank = class {
709712
debugger;
710713
};
711714
} else {
712-
let msb = 0, prg = 0, lsb = 0, name, poly = 1, type = 0, drum;
715+
let msb = 0, prg = 0, lsb = 0, name, poly = 1, type = 0, level, drum;
713716
assign.forEach(async function (e1, i1) {
714717
switch (i1) {
715718
case sig[0]: {
@@ -742,6 +745,12 @@ let VoiceBank = class {
742745
drum = e1;
743746
break;
744747
};
748+
case sig[6]: {
749+
if (e1?.constructor) {
750+
level = parseInt(e1);
751+
};
752+
break;
753+
};
745754
};
746755
});
747756
upThis.#bankInfo[prg] = upThis.#bankInfo[prg] || [];
@@ -753,7 +762,8 @@ let VoiceBank = class {
753762
name,
754763
poly,
755764
type,
756-
drum
765+
drum,
766+
level
757767
};
758768
/*if (loadCount > 889 && loadCount < 910) {
759769
console.debug(e);

0 commit comments

Comments
 (0)