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

*really* fix instrument triggers

Browse source 
last commit was completely wrong. also i read somewhere that the
instrument alone doesn't reset volume, which is apparently a lie.
This commit is contained in:
Andy Sloane 2015-10-30 22:54:19 -07:00
commit acffa056a5
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
xm.js
View file

@ -219,20 +219,23 @@ function next_row() {
cur_row++;
for (var i = 0; i < r.length; i++) {
var ch = channelinfo[i];
var inst = ch.inst;
ch.update = false;
var triggernote = false;
// instrument trigger
if (r[i][1] != -1) {
var inst = instruments[r[i][1] - 1];
inst = instruments[r[i][1] - 1];
if (inst != undefined) {
ch.inst = inst;
// retrigger unless overridden below
triggernote = true;
// new instrument doesn ot reset volume!
ch.pan = inst.pan;
ch.vol = inst.vol;
} else {
// console.log("invalid inst", r[i][1], instruments.length);
}
}
// note trigger
if (r[i][0] != -1) {
if (r[i][0] == 96) {
@ -241,14 +244,10 @@ function next_row() {
} else {
// assume linear frequency table (flags header & 1 == 1)
// is this true in kamel.xm?
var inst = ch.inst;
if (inst != undefined) {
var note = r[i][0] + inst.note;
ch.note = note;
triggernote = true;
// if there's an instrument and a note, set the volume
ch.pan = inst.pan;
ch.vol = inst.vol;
}
}
}
@ -320,9 +319,7 @@ function next_row() {
ch.vibratopos = 0;
ch.env_vol = new EnvelopeFollower(inst.env_vol);
ch.env_pan = new EnvelopeFollower(inst.env_pan);
if (note) {
ch.period = PeriodForNote(ch, note);
}
ch.period = PeriodForNote(ch, ch.note);
}
}
}