Demos/jsxm
Watch
1
0
Fork
You've already forked jsxm
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only instruments with samplemaps can play

Browse source 
by refactoring the xm loader i inadvertently broke this
This commit is contained in:
Andy Sloane 2015-11-03 09:50:19 -08:00
commit fd52b21e3f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xm.js
View file

@ -244,11 +244,11 @@ function next_row() {
// instrument trigger // instrument trigger
if (r[i][1] != -1) { if (r[i][1] != -1) {
inst = xm.instruments[r[i][1] - 1]; inst = xm.instruments[r[i][1] - 1];
if (inst != undefined) { if (inst && inst.samplemap) {
ch.inst = inst; ch.inst = inst;
// retrigger unless overridden below // retrigger unless overridden below
triggernote = true; triggernote = true;
if (ch.note) { if (ch.note && inst.samplemap) {
ch.samp = inst.samples[inst.samplemap[ch.note]]; ch.samp = inst.samples[inst.samplemap[ch.note]];
ch.vol = ch.samp.vol; ch.vol = ch.samp.vol;
ch.pan = ch.samp.pan; ch.pan = ch.samp.pan;
@ -264,7 +264,7 @@ function next_row() {
ch.release = 1; ch.release = 1;
triggernote = false; triggernote = false;
} else { } else {
if (inst != undefined) { if (inst && inst.samplemap) {
var note = r[i][0]; var note = r[i][0];
ch.note = note; ch.note = note;
ch.samp = inst.samples[inst.samplemap[ch.note]]; ch.samp = inst.samples[inst.samplemap[ch.note]];
@ -324,7 +324,7 @@ function next_row() {
ch.periodtarget = PeriodForNote(ch, ch.note); ch.periodtarget = PeriodForNote(ch, ch.note);
} }
triggernote = false; triggernote = false;
if (inst != undefined) { if (inst && inst.samplemap) {
if (ch.env_vol == undefined) { if (ch.env_vol == undefined) {
// note wasn't already playing; we basically have to ignore the // note wasn't already playing; we basically have to ignore the
// portamento and just trigger // portamento and just trigger