From d5c99e21e229089718ab7b6a0d7ecf7d7d121745 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Mon, 2 Nov 2015 20:48:38 -0800
Subject: [PATCH 01/65] experimenting: linear interpolation

---
 xm.js | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/xm.js b/xm.js
index de89689..cc943e0 100644
--- a/xm.js
+++ b/xm.js
@@ -135,7 +135,7 @@ function FilterCoeffs(f_c) {
   var e = Math.exp(-wct);
   var c = e * Math.cos(wct);
   var s = e * Math.sin(wct);
-  var gain = (1 - 2*c + c*c + s*s) / 2;
+  var gain = (1 - 2*c + c*c + s*s);
   return [gain, 2*c, -c*c - s*s];
 }
 
@@ -481,7 +481,6 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
     looplen = instsamp.looplen;
     sample_end = loopstart + looplen;
   }
-  var samplen = instsamp.len;
   var volE = ch.volE / 64.0;    // current volume envelope
   var panE = 4*(ch.panE - 32);  // current panning envelope
   var p = panE + ch.pan - 128;  // final pan
@@ -530,6 +529,7 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
     var next_event = Math.max(1, Math.min(end, i + (sample_end - k) / dk));
     // this is the inner loop of the player
 
+    /*
     // unrolled 8x
     for (; i + 7 < next_event; i+=8) {
       var s = samp[k|0];
@@ -599,20 +599,25 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
       vL = pf_8 * vL + (1 - pf_8) * volL;
       vR = pf_8 * vR + (1 - pf_8) * volR;
     }
+    */
 
     for (; i < next_event; i++) {
-      var s = samp[k|0];
+      var s0 = samp[k|0];
+      var s1 = samp[1+k|0];
+      var t = k - (k|0);
       // we low-pass filter here since we are resampling some arbitrary
       // frequency to f_smp; this is an anti-aliasing filter and is
       // implemented as an IIR butterworth filter (usually we'd use an FIR
       // brick wall filter, but this is much simpler computationally and
       // sounds fine)
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
-      fs2 = fs1; fs1 = y; fs0 = s;
+      var y = f0 * (t*s1 + (1-t) * s0) + f1*fs1 + f2*fs2;
+      fs2 = fs1; fs1 = y;
       dataL[i] += vL * y;
       dataR[i] += vR * y;
       Vrms += (vL + vR) * y * y;
       k += dk;
+      vL = popfilter_alpha * vL + (1 - popfilter_alpha) * volL;
+      vR = popfilter_alpha * vR + (1 - popfilter_alpha) * volR;
     }
   }
   ch.off = k;
@@ -688,26 +693,25 @@ function audio_cb(e) {
 function ConvertSample(array, bits) {
   var len = array.length;
   var acc = 0;
+  var samp = new Float32Array(len+1);
   if (bits == 0) {  // 8 bit sample
-    var samp = new Float32Array(len);
     for (var k = 0; k < len; k++) {
       acc += array[k];
       var b = acc&255;
       if (b & 128) b = b-256;
       samp[k] = b / 128.0;
     }
-    return samp;
   } else {
     len /= 2;
-    var samp = new Float32Array(len);
     for (var k = 0; k < len; k++) {
       acc += array[k*2] + (array[k*2 + 1] << 8);
       var b = acc&65535;
       if (b & 32768) b = b-65536;
       samp[k] = b / 32768.0;
     }
-    return samp;
   }
+  samp[len] = samp[len-1];
+  return samp;
 }
 
 // optimization: unroll short sample loops so we can run our inner mixing loop
@@ -721,7 +725,7 @@ function UnrollSampleLoop(samp) {
     nloops = (nloops + 1) & (~1);
   }
   var samplesiz = samp.loop + nloops * samp.looplen;
-  var data = new Float32Array(samplesiz);
+  var data = new Float32Array(samplesiz + 1);
   for (var i = 0; i < samp.loop; i++) {
     data[i] = samp.sampledata[i];
   }
@@ -896,7 +900,8 @@ function playXM(arrayBuf) {
           'pan': samppan, 'type': samptype, 'vol': sampvol,
           'fine': sampfinetune,
           'sampledata': ConvertSample(
-              new Uint8Array(arrayBuf, sampleoffset, samplen), samptype & 16),
+              new Uint8Array(arrayBuf, sampleoffset, samplen),
+              samptype & 16),
         };
         // length / pointers are all specified in bytes; fixup for 16-bit samples
         if (samptype & 16) {
@@ -906,8 +911,13 @@ function playXM(arrayBuf) {
         }
 
         // unroll short loops and any pingpong loops
-        if ((samp.type & 3) && (samp.looplen < 2048 || (samp.type & 2))) {
-          UnrollSampleLoop(samp);
+        if (samp.type & 3) {
+          if ((samp.looplen < 2048 || (samp.type & 2))) {
+            UnrollSampleLoop(samp);
+          }
+          // overwrite loop boundary sample (we always have at least one
+          // extra sample for interpolation)
+          samp.sampledata[samp.loop + samp.looplen] = samp.sampledata[samp.loop];
         }
         samps.push(samp);
 

From ea6edaf2e4ba148f3f6f2d54a008f0c014946ae2 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 3 Nov 2015 08:42:09 -0800
Subject: [PATCH 02/65] add play/pause function

---
 index.html |   5 +-
 xm.js      | 248 +++++++++++++++++++++++++++++++++--------------------
 2 files changed, 157 insertions(+), 96 deletions(-)

diff --git a/index.html b/index.html
index 3bc0bb7..20a54db 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,8 @@
   <script src="xm.js"></script>
   <script src="xmeffects.js"></script>
 </head>
-<body>
+<body onload="main()">
+  <div><button id='playpause' disabled=true style="width: 100px">Play</button></div>
   <div><canvas id='vu' width=224 height=64></canvas></div>
   <div><canvas id='gfxpattern' width=640 height=200></canvas></div>
 <pre id='debug'>
@@ -14,9 +15,7 @@
 code: <a href="http://github.com/a1k0n/jsxm/">github.com/a1k0n/jsxm</a>
 todo:
  - file picker, upload more xms to a host we can access cross-origin
- - make display even more faithfully FT2-like
  - render instrument list in ft2 font
- - oscilloscope trigger on zero crossing or something
  - missing XM effects:
    - E3x, E4x, E5x, E6x, E7x, E9x, EDx, EEx
    - 7xy - tremolo
diff --git a/xm.js b/xm.js
index de89689..0f93491 100644
--- a/xm.js
+++ b/xm.js
@@ -1,18 +1,17 @@
-var audioctx;
-var songname = '';
-var fontimg = new Image();
-var pat_canvas = document.createElement('canvas');
-fontimg.onload = function() {
-  // FIXME: don't attempt to render until this loads
-};
+var xm;  // contains all song data
+var audioctx;  // AudioContext
 
+// Load font (ripped from FastTracker 2)
+var fontimg = new Image();
 fontimg.src = "ft2font.png";
 
+// canvas to render patterns onto
+var pat_canvas = document.createElement('canvas');
+
+// 
 var _note_names = ["C-", "C#", "D-", "D#", "E-", "F-", "F#", "G-", "G#", "A-", "A#", "B-"];
 var f_smp = 44100;  // updated by play callback, default value here
 
-audioContext = window.AudioContext || window.webkitAudioContext;
-
 var _fontmap_notes = [8*5, 8*22, 8*28];
 var _pattern_cellwidth = 16 + 4 + 8 + 4 + 8 + 16 + 4;
 var _scope_width = _pattern_cellwidth - 1;
@@ -121,10 +120,6 @@ function getstring(dv, offset, len) {
   return str.join('');
 }
 
-var channelinfo = [];
-var instruments = [];
-var tempo = 4;
-
 // Return 2-pole Butterworth lowpass filter coefficients for
 // center frequncy f_c (relative to sampling frequency)
 function FilterCoeffs(f_c) {
@@ -159,6 +154,8 @@ function PeriodForNote(ch, note) {
 var audio_events = [];
 var shown_row = undefined;
 function RedrawScreen() {
+  if (audio_events.length == 0) return;
+
   var e;
   var t = audioctx.currentTime;
   do {
@@ -176,7 +173,7 @@ function RedrawScreen() {
     ctx.fillRect(0, 0, canvas.width, 64);
     ctx.fillStyle = '#0f0';
     ctx.strokeStyle = '#55acff';
-    for (var j = 0; j < nchan; j++) {
+    for (var j = 0; j < xm.nchan; j++) {
       var x = _pattern_border + j * _pattern_cellwidth;
       // render channel number
       if (j >= 10) {
@@ -199,14 +196,14 @@ function RedrawScreen() {
   }
 
   var debug = document.getElementById("debug");
-  debug.innerHTML = songname + '<br>pat ' + e.pat + ' row ' + (e.row);
+  debug.innerHTML = xm.songname + '<br>pat ' + e.pat + ' row ' + (e.row);
 
   if (e.row != shown_row) {
     var gfx = document.getElementById("gfxpattern");
     if (e.pat != pat_canvas_patnum) {
-      var p = patterns[e.pat];
+      var p = xm.patterns[e.pat];
       if (p != undefined) {
-        RenderPattern(pat_canvas, patterns[e.pat]);
+        RenderPattern(pat_canvas, xm.patterns[e.pat]);
         pat_canvas_patnum = e.pat;
       }
     }
@@ -230,23 +227,23 @@ function RedrawScreen() {
 var cur_songpos = -1, cur_pat = -1, cur_row = 64, cur_ticksamp = 0;
 var cur_tick = 6;
 function next_row() {
-  if (cur_pat == -1 || cur_row >= patterns[cur_pat].length) {
+  if (cur_pat == -1 || cur_row >= xm.patterns[cur_pat].length) {
     cur_row = 0;
     cur_songpos++;
-    if (cur_songpos >= songpats.length)
-      cur_songpos = song_looppos;
-    cur_pat = songpats[cur_songpos];
+    if (cur_songpos >= xm.songpats.length)
+      cur_songpos = xm.song_looppos;
+    cur_pat = xm.songpats[cur_songpos];
   }
-  var p = patterns[cur_pat];
+  var p = xm.patterns[cur_pat];
   var r = p[cur_row];
   cur_row++;
   for (var i = 0; i < r.length; i++) {
-    var ch = channelinfo[i];
+    var ch = xm.channelinfo[i];
     var inst = ch.inst;
     var triggernote = false;
     // instrument trigger
     if (r[i][1] != -1) {
-      inst = instruments[r[i][1] - 1];
+      inst = xm.instruments[r[i][1] - 1];
       if (inst != undefined) {
         ch.inst = inst;
         // retrigger unless overridden below
@@ -408,12 +405,12 @@ EnvelopeFollower.prototype.Tick = function(release) {
 
 function next_tick() {
   cur_tick++;
-  if (cur_tick >= tempo) {
+  if (cur_tick >= xm.tempo) {
     cur_tick = 0;
     next_row();
   }
-  for (var j = 0; j < nchan; j++) {
-    var ch = channelinfo[j];
+  for (var j = 0; j < xm.nchan; j++) {
+    var ch = xm.channelinfo[j];
     var inst = ch.inst;
     ch.periodoffset = 0;
     if (cur_tick != 0) {
@@ -421,12 +418,12 @@ function next_tick() {
       if(ch.effectfn) ch.effectfn(ch);
     }
     if (isNaN(ch.period)) {
-      console.log(prettify_notedata(patterns[cur_pat][cur_row-1][j]),
+      console.log(prettify_notedata(xm.patterns[cur_pat][cur_row-1][j]),
           "set channel", j, "period to NaN");
     }
     if (inst == undefined) continue;
     if (ch.env_vol == undefined) {
-      console.log(prettify_notedata(patterns[cur_pat][cur_row-1][j]),
+      console.log(prettify_notedata(xm.patterns[cur_pat][cur_row-1][j]),
           "set channel", j, "env_vol to undefined, but note is playing");
       continue;
     }
@@ -637,7 +634,7 @@ function audio_cb(e) {
   }
 
   var offset = 0;
-  var ticklen = 0|(f_smp * 2.5 / bpm);
+  var ticklen = 0|(f_smp * 2.5 / xm.bpm);
 
   while(buflen > 0) {
     if (cur_pat == -1 || cur_ticksamp >= ticklen) {
@@ -645,9 +642,9 @@ function audio_cb(e) {
       cur_ticksamp -= ticklen;
     }
     var tickduration = Math.min(buflen, ticklen - cur_ticksamp);
-    var VU = new Float32Array(nchan);
+    var VU = new Float32Array(xm.nchan);
     var scopes = undefined;
-    for (var j = 0; j < nchan; j++) {
+    for (var j = 0; j < xm.nchan; j++) {
       var scope;
       if (tickduration >= 4*_scope_width) {
         scope = new Float32Array(_scope_width);
@@ -657,7 +654,7 @@ function audio_cb(e) {
       }
 
       VU[j] = MixChannelIntoBuf(
-          channelinfo[j], offset, offset + tickduration, dataL, dataR) /
+          xm.channelinfo[j], offset, offset + tickduration, dataL, dataR) /
         tickduration;
 
       if (tickduration >= 4*_scope_width) {
@@ -742,23 +739,24 @@ function UnrollSampleLoop(samp) {
   samp.type = 1;
 }
 
-function playXM(arrayBuf) {
+function loadXM(arrayBuf) {
   var dv = new DataView(arrayBuf);
-  window.dv = dv;
+  var xm = {};
 
-  songname = getstring(dv, 17, 20);
+  xm.songname = getstring(dv, 17, 20);
   var hlen = dv.getUint32(0x3c, true) + 0x3c;
   var songlen = dv.getUint16(0x40, true);
-  song_looppos = dv.getUint16(0x42, true);
-  nchan = dv.getUint16(0x44, true);
+  xm.song_looppos = dv.getUint16(0x42, true);
+  xm.nchan = dv.getUint16(0x44, true);
   var npat = dv.getUint16(0x46, true);
   var ninst = dv.getUint16(0x48, true);
-  var flags = dv.getUint16(0x4a, true);
-  tempo = dv.getUint16(0x4c, true);
-  bpm = dv.getUint16(0x4e, true);
-  document.getElementById('vu').width = _pattern_border + _pattern_cellwidth * nchan;
-  for (var i = 0; i < nchan; i++) {
-    channelinfo.push({
+  xm.flags = dv.getUint16(0x4a, true);
+  xm.tempo = dv.getUint16(0x4c, true);
+  xm.bpm = dv.getUint16(0x4e, true);
+  xm.channelinfo = [];
+
+  for (var i = 0; i < xm.nchan; i++) {
+    xm.channelinfo.push({
       number: i,
       filterstate: new Float32Array(3),
       vol: 0,
@@ -775,18 +773,18 @@ function playXM(arrayBuf) {
   }
   console.log("header len " + hlen);
 
-  console.log("songlen %d, %d channels, %d patterns, %d instruments", songlen, nchan, npat, ninst);
-  console.log("loop @%d", song_looppos);
-  console.log("flags=%d tempo %d bpm %d", flags, tempo, bpm);
+  console.log("songlen %d, %d channels, %d patterns, %d instruments", songlen, xm.nchan, npat, ninst);
+  console.log("loop @%d", xm.song_looppos);
+  console.log("flags=%d tempo %d bpm %d", xm.flags, xm.tempo, xm.bpm);
 
-  songpats = [];
+  xm.songpats = [];
   for (var i = 0; i < songlen; i++) {
-    songpats.push(dv.getUint8(0x50 + i));
+    xm.songpats.push(dv.getUint8(0x50 + i));
   }
-  console.log("song patterns: ", songpats);
+  console.log("song patterns: ", xm.songpats);
 
   var idx = hlen;
-  patterns = [];
+  xm.patterns = [];
   for (var i = 0; i < npat; i++) {
     var pattern = [];
     var patheaderlen = dv.getUint32(idx, true);
@@ -796,7 +794,7 @@ function playXM(arrayBuf) {
     idx += 9;
     for (var j = 0; patsize > 0 && j < patrows; j++) {
       row = [];
-      for (var k = 0; k < nchan; k++) {
+      for (var k = 0; k < xm.nchan; k++) {
         var byte0 = dv.getUint8(idx); idx++;
         var note = -1, inst = -1, vol = -1, efftype = 0, effparam = 0;
         if (byte0 & 0x80) {
@@ -829,15 +827,19 @@ function playXM(arrayBuf) {
       }
       pattern.push(row);
     }
-    patterns.push(pattern);
+    xm.patterns.push(pattern);
   }
 
-  var namelist = [];
+  xm.instruments = [];
   // now load instruments
   for (i = 0; i < ninst; i++) {
     var hdrsiz = dv.getUint32(idx, true);
     var instname = getstring(dv, idx+0x4, 22);
     var nsamp = dv.getUint16(idx+0x1b, true);
+    var inst = {
+      'name': instname,
+      'number': i,
+    };
     if (nsamp > 0) {
       // return a slice so we have a fresh copy and don't retain pointers to
       // the original xm file arraybuf forever
@@ -915,21 +917,16 @@ function playXM(arrayBuf) {
         totalsamples += samplen;
       }
       idx += totalsamples;
-      inst = {
-        'name': instname,
-        'number': i,
-        'fadeout': vol_fadeout,
-        'samplemap': samplemap,
-        'samples': samps,
-      };
+      inst.samplemap = samplemap;
+      inst.samples = samps;
       if (env_vol_type) {
         // insert an automatic fadeout to 0 at the end of the envelope
         var env_end_tick = env_vol[env_vol.length-2];
         if (!(env_vol_type & 2)) {  // if there's no sustain point, create one
           env_vol_sustain = env_vol.length / 2;
         }
-        if (inst.fadeout > 0) {
-          var fadeout_ticks = 65536.0 / inst.fadeout;
+        if (vol_fadeout > 0) {
+          var fadeout_ticks = 65536.0 / vol_fadeout;
           env_vol.push(env_end_tick + fadeout_ticks);
           env_vol.push(0);
         }
@@ -958,49 +955,114 @@ function playXM(arrayBuf) {
         // create a default empty envelope
         inst.env_pan = new Envelope([0, 32], 0, 0, 0, 0);
       }
-      instruments.push(inst);
     } else {
       idx += hdrsiz;
       console.log("empty instrument", i, hdrsiz, idx);
-      instruments.push(null);
     }
-
-    var n = (i+1).toString(16);
-    if (i < 15) n = ' ' + n;
-    namelist.push(n + " " + instname);
+    xm.instruments.push(inst);
   }
 
+  var debug = document.getElementById("debug");
+  console.log("loaded \"" + xm.songname + "\"");
+  debug.innerHTML = xm.songname;
+
+  var instrlist = document.getElementById("instruments");
+  var namelist = [];
+  for (var j = 0; j < xm.instruments.length; j++) {
+    var n = (j+1).toString(16);
+    if (j < 15) n = ' ' + n;
+    namelist.push(n + " " + xm.instruments[j].name);
+  }
+  instrlist.innerHTML = namelist.join("\n");
+
+  return xm;
+}
+
+var playing = false;
+var jsNode, gainNode;
+var paused_events = [];
+function InitAudio() {
+  audioContext = window.AudioContext || window.webkitAudioContext;
   audioctx = new audioContext();
   gainNode = audioctx.createGain();
   gainNode.gain.value = 0.1;  // master volume
   jsNode = audioctx.createScriptProcessor(16384, 0, 2);
   jsNode.onaudioprocess = audio_cb;
-  jsNode.connect(gainNode);
-
-  var debug = document.getElementById("debug");
-  console.log("loaded \"" + songname + "\"");
-  debug.innerHTML = songname;
-  var gfxpattern = document.getElementById("gfxpattern");
-  gfxpattern.width = _pattern_cellwidth * nchan + _pattern_border;
-
-  var instrlist = document.getElementById("instruments");
-  instrlist.innerHTML = namelist.join("\n");
-
-  // start playing
   gainNode.connect(audioctx.destination);
 }
 
-var xmReq = new XMLHttpRequest();
-var uri = location.search.substr(1);
-if (uri == "") {
-  uri = "kamel.xm";
-}
-xmReq.open("GET", uri, true);
-xmReq.responseType = "arraybuffer";
-xmReq.onload = function (xmEvent) {
-  var arrayBuffer = xmReq.response;
-  if (arrayBuffer) {
-    playXM(arrayBuffer);
+function PlayXM() {
+  if (!playing) {
+    // put paused events back into action, if any
+    var t = audioctx.currentTime;
+    while (paused_events.length > 0) {
+      var e = paused_events.shift();
+      e.t += t;
+      audio_events.push(e);
+    }
+    // start playing
+    jsNode.connect(gainNode);
+    requestAnimationFrame(RedrawScreen);
   }
+  playing = true;
 }
-xmReq.send(null);
+
+function PauseXM() {
+  if (playing) {
+    jsNode.disconnect(gainNode);
+    // grab all the audio events 
+    var t = audioctx.currentTime;
+    while (audio_events.length > 0) {
+      var e = audio_events.shift();
+      e.t -= t;
+      paused_events.push(e);
+    }
+  }
+  playing = false;
+}
+
+function main() {
+  InitAudio();
+  var xmReq = new XMLHttpRequest();
+  var uri = location.search.substr(1);
+  if (uri == "") {
+    uri = "kamel.xm";
+  }
+  xmReq.open("GET", uri, true);
+  xmReq.responseType = "arraybuffer";
+  xmReq.onload = function (xmEvent) {
+    var arrayBuffer = xmReq.response;
+    if (arrayBuffer) {
+      xm = loadXM(arrayBuffer);
+    } else {
+      console.log("unable to load", uri);
+    }
+    document.getElementById('vu').width = _pattern_border + _pattern_cellwidth * xm.nchan;
+    var gfxpattern = document.getElementById("gfxpattern");
+    gfxpattern.width = _pattern_cellwidth * xm.nchan + _pattern_border;
+    var playbutton = document.getElementById('playpause');
+    playbutton.onclick = function() {
+      if (playing) {
+        PauseXM();
+        playbutton.innerHTML='Play';
+      } else {
+        PlayXM();
+        playbutton.innerHTML='Pause';
+      }
+    }
+    playbutton.disabled = false;
+    // generate a fake audio event to render the initial paused screen
+    var scopes = [];
+    for (var i = 0; i < xm.nchan; i++) {
+      scopes.push(new Float32Array(_scope_width));
+    }
+    audio_events.push({
+      t: 0, row: 0, pat: xm.songpats[0],
+      vu: new Float32Array(xm.nchan),
+      scopes: scopes
+    });
+    RedrawScreen();
+  }
+  xmReq.send(null);
+}
+

From fd52b21e3ff75622e80230b00d361dfa74da70ab Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 3 Nov 2015 09:50:19 -0800
Subject: [PATCH 03/65] only instruments with samplemaps can play

by refactoring the xm loader i inadvertently broke this
---
 xm.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

From 3c0a865824a1c2437439df7ff4cb220b264528c2 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 3 Nov 2015 09:57:40 -0800
Subject: [PATCH 04/65] update the effects code after moving stuff into xm

---
 xmeffects.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xmeffects.js b/xmeffects.js
index 4c25716..a936bba 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -103,9 +103,9 @@ function eff_t1_a(ch) {  // volume slide
 }
 
 function eff_t0_b(ch, data) {  // song jump (untested)
-  if (data < songpats.length) {
+  if (data < xm.songpats.length) {
     cur_songpos = data
-    cur_pat = songpats[cur_songpos];
+    cur_pat = xm.songpats[cur_songpos];
   }
 }
 
@@ -115,9 +115,9 @@ function eff_t0_c(ch, data) {  // set volume
 
 function eff_t0_d(ch, data) {  // pattern jump
   cur_songpos++;
-  if (cur_songpos >= songpats.length)
-    cur_songpos = song_looppos;
-  cur_pat = songpats[cur_songpos];
+  if (cur_songpos >= xm.songpats.length)
+    cur_songpos = xm.song_looppos;
+  cur_pat = xm.songpats[cur_songpos];
   cur_row = data;
 }
 

From f95bd1e169619ab218a29195f78730d9e9bbe04b Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 3 Nov 2015 17:55:12 -0800
Subject: [PATCH 05/65] whoops, more refactoring bugs

i should really write some tests.
---
 xmeffects.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xmeffects.js b/xmeffects.js
index a936bba..38515d9 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -169,9 +169,9 @@ function eff_t0_f(ch, data) {  // set tempo
     console.log("tempo 0?");
     return;
   } else if(data < 0x20) {
-    tempo = data;
+    xm.tempo = data;
   } else {
-    bpm = data;
+    xm.bpm = data;
   }
 }
 

From b859f27109a9b92712bf2389cfdad8002f0b6201 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 3 Nov 2015 18:16:00 -0800
Subject: [PATCH 06/65] disable looping if looplen = 0...

so much pathological crap in XM files...
---
 xm.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xm.js b/xm.js
index 05ddf84..a135eea 100644
--- a/xm.js
+++ b/xm.js
@@ -472,7 +472,7 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
 
   var samp = instsamp.sampledata;
   var sample_end = instsamp.len;
-  if ((instsamp.type & 3) == 1) { // todo: support pingpong
+  if ((instsamp.type & 3) == 1 && instsamp.looplen > 0) {
     loop = true;
     loopstart = instsamp.loop;
     looplen = instsamp.looplen;
@@ -511,7 +511,8 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
   var failsafe = 100;
   while (i < end) {
     if (failsafe-- == 0) {
-      console.log("failsafe in mixing loop!", k, sample_end, loopstart, looplen, dk);
+      console.log("failsafe in mixing loop! channel", ch.number, k, sample_end,
+          loopstart, looplen, dk);
       break;
     }
     if (k >= sample_end) {  // TODO: implement pingpong looping

From 54809c2b8187294ec9f5d55c0b79ec4bdfeb24c1 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 4 Nov 2015 05:50:29 -0800
Subject: [PATCH 07/65] bugfix for 9xx offset effect

---
 xm.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xm.js b/xm.js
index a135eea..492a50f 100644
--- a/xm.js
+++ b/xm.js
@@ -341,7 +341,8 @@ function next_row() {
     }
 
     if (triggernote) {
-      ch.off = 0;
+      // there's gotta be a less hacky way to handle offset commands...
+      if (ch.effect != 9) ch.off = 0;
       ch.release = 0;
       ch.envtick = 0;
       ch.vibratopos = 0;

From f092f847f7ee789ccdea61c8ec0208405f24a2e8 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 4 Nov 2015 06:22:49 -0800
Subject: [PATCH 08/65] instrument list rendering with FT2 font.

---
 index.html | 11 ++++----
 xm.js      | 79 ++++++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/index.html b/index.html
index 20a54db..5935e53 100644
--- a/index.html
+++ b/index.html
@@ -4,13 +4,14 @@
   <script src="xmeffects.js"></script>
 </head>
 <body onload="main()">
-  <div><button id='playpause' disabled=true style="width: 100px">Play</button></div>
-  <div><canvas id='vu' width=224 height=64></canvas></div>
-  <div><canvas id='gfxpattern' width=640 height=200></canvas></div>
+  <div style="background:#000">
+    <div><canvas id='vu' width=224 height=64></canvas></div>
+    <div><canvas id='gfxpattern' width=640 height=200></canvas></div>
+    <div id='instruments'></div>
+    <div><button id='playpause' disabled=true style="width: 100px">Play</button></div>
+  </div>
 <pre id='debug'>
 </pre>
-<pre id='instruments'>
-</pre>
 <pre>
 code: <a href="http://github.com/a1k0n/jsxm/">github.com/a1k0n/jsxm</a>
 todo:
diff --git a/xm.js b/xm.js
index 492a50f..7a0f867 100644
--- a/xm.js
+++ b/xm.js
@@ -8,10 +8,37 @@ fontimg.src = "ft2font.png";
 // canvas to render patterns onto
 var pat_canvas = document.createElement('canvas');
 
-// 
+// for pretty-printing notes
 var _note_names = ["C-", "C#", "D-", "D#", "E-", "F-", "F#", "G-", "G#", "A-", "A#", "B-"];
+
 var f_smp = 44100;  // updated by play callback, default value here
 
+// pixel widths of each character in the proportional font
+var _fontwidths = [
+  4, 7, 3, 6, 6, 6, 6, 5, 4, 5, 5, 5, 5, 5, 7, 7,
+  5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 7,
+  4, 2, 5, 7, 7, 7, 7, 3, 4, 4, 6, 6, 3, 6, 2, 7,
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 2, 3, 6, 6, 6, 7,
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 7, 7, 7, 8, 8, 7,
+  7, 7, 7, 7, 8, 7, 7, 8, 8, 8, 7, 4, 7, 4, 4, 5,
+  3, 6, 6, 6, 6, 6, 4, 6, 6, 2, 4, 6, 2, 8, 6, 6,
+  6, 6, 4, 6, 4, 6, 7, 8, 7, 6, 6, 4, 2, 4, 4, 4];
+
+// draw FT2 proportional font text to a drawing context
+// returns width rendered
+function DrawText(text, dx, dy, ctx) {
+  var dx0 = dx;
+  for (var i = 0; i < text.length; i++) {
+    var n = text.charCodeAt(i);
+    var sx = (n&63)*8;
+    var sy = (n>>6)*10 + 7*8;
+    var width = _fontwidths[n];
+    ctx.drawImage(fontimg, sx, sy, width, 10, dx, dy, width, 10);
+    dx += width + 1;
+  }
+  return dx - dx0;
+}
+
 var _fontmap_notes = [8*5, 8*22, 8*28];
 var _pattern_cellwidth = 16 + 4 + 8 + 4 + 8 + 16 + 4;
 var _scope_width = _pattern_cellwidth - 1;
@@ -176,10 +203,7 @@ function RedrawScreen() {
     for (var j = 0; j < xm.nchan; j++) {
       var x = _pattern_border + j * _pattern_cellwidth;
       // render channel number
-      if (j >= 10) {
-        ctx.drawImage(fontimg, 8*((j/10)|0), 4*8, 4, 8, x, 1, 4, 8);
-      }
-      ctx.drawImage(fontimg, 8*(j%10), 4*8, 4, 8, x+4, 1, 4, 8);
+      DrawText(j, x, 1, ctx);
 
       // volume in dB as a green bar
       var vu_y = -Math.log(VU[j])*10;
@@ -969,13 +993,46 @@ function loadXM(arrayBuf) {
   debug.innerHTML = xm.songname;
 
   var instrlist = document.getElementById("instruments");
-  var namelist = [];
-  for (var j = 0; j < xm.instruments.length; j++) {
-    var n = (j+1).toString(16);
-    if (j < 15) n = ' ' + n;
-    namelist.push(n + " " + xm.instruments[j].name);
+  var instrcols = ((xm.instruments.length + 7) / 8) | 0;
+  for (var i = 0; i < instrcols; i++) {
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+    var instrcolumnwidth = 8*22;
+    canvas.width = instrcolumnwidth;
+    canvas.height = 8 * 10;
+    ctx.fillStyle = '#000';
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    var hasname = 0, hasdata = 0;
+    for (var j = 8*i; j < Math.min(8*i+8, xm.instruments.length); j++) {
+      var y = 10*(j - 8*i);
+      var n = (j+1).toString(16);
+      if (j < 15) n = '0' + n;
+      var data = xm.instruments[j].samples;
+      if (data) {
+        var len = data[0].len;
+        data = data[0].sampledata;
+        var scale = Math.ceil(len / instrcolumnwidth);
+        ctx.strokeStyle = '#55acff';
+        ctx.beginPath();
+        for (var k = 0; k < Math.min(len / scale, instrcolumnwidth - 20); k++) {
+          ctx.lineTo(k + 20, y + data[k*scale] * 4 + 4);
+        }
+        ctx.stroke();
+        hasdata++;
+      }
+      var name = xm.instruments[j].name;
+      ctx.globalCompositeOperation = 'lighten';
+      DrawText(n, 1, y, ctx);
+      if (name != '') {
+        DrawText(xm.instruments[j].name, 20, y, ctx);
+        hasname++;
+      }
+      ctx.globalCompositeOperation = 'source-over';
+    }
+    if (hasname || hasdata) {
+      instrlist.appendChild(canvas);
+    }
   }
-  instrlist.innerHTML = namelist.join("\n");
 
   return xm;
 }

From a5477320632fd780d516421869e9d8c5c0b5ef4d Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 4 Nov 2015 07:19:44 -0800
Subject: [PATCH 09/65] render a nice big title and center stuff

---
 index.html | 14 ++++++++++----
 xm.js      | 47 ++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 5935e53..c0d7a18 100644
--- a/index.html
+++ b/index.html
@@ -2,16 +2,22 @@
   <title>js xm</title>
   <script src="xm.js"></script>
   <script src="xmeffects.js"></script>
+  <style>
+canvas.centered {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+};
+  </style>
 </head>
 <body onload="main()">
   <div style="background:#000">
-    <div><canvas id='vu' width=224 height=64></canvas></div>
-    <div><canvas id='gfxpattern' width=640 height=200></canvas></div>
+    <div><canvas class="centered" id='title' width=640 height=22></canvas></div>
+    <div><canvas class="centered" id='vu' width=224 height=64></canvas></div>
+    <div><canvas class="centered" id='gfxpattern' width=640 height=200></canvas></div>
     <div id='instruments'></div>
     <div><button id='playpause' disabled=true style="width: 100px">Play</button></div>
   </div>
-<pre id='debug'>
-</pre>
 <pre>
 code: <a href="http://github.com/a1k0n/jsxm/">github.com/a1k0n/jsxm</a>
 todo:
diff --git a/xm.js b/xm.js
index 7a0f867..490f098 100644
--- a/xm.js
+++ b/xm.js
@@ -24,6 +24,16 @@ var _fontwidths = [
   3, 6, 6, 6, 6, 6, 4, 6, 6, 2, 4, 6, 2, 8, 6, 6,
   6, 6, 4, 6, 4, 6, 7, 8, 7, 6, 6, 4, 2, 4, 4, 4];
 
+var _bigfontwidths = [
+   4, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 13, 13, 13, 15, 15, 15, 15, 15,
+   4,  5, 12, 16, 15, 15, 16,  5,  8,  8, 13, 10,  6, 10,  5, 12,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  5,  6, 12, 10, 12, 15,
+  14, 15, 15, 15, 15, 15, 15, 15, 15,  5, 13, 15, 14, 15, 15, 15,
+  15, 16, 15, 15, 15, 15, 15, 15, 15, 15, 16,  7, 12,  7, 13, 15,
+   5, 13, 13, 13, 13, 13, 11, 13, 13,  5,  9, 13,  5, 16, 13, 13,
+  13, 13, 12, 13, 11, 13, 13, 16, 15, 13, 15,  9,  2,  9, 15, 15];
+
 // draw FT2 proportional font text to a drawing context
 // returns width rendered
 function DrawText(text, dx, dy, ctx) {
@@ -31,7 +41,7 @@ function DrawText(text, dx, dy, ctx) {
   for (var i = 0; i < text.length; i++) {
     var n = text.charCodeAt(i);
     var sx = (n&63)*8;
-    var sy = (n>>6)*10 + 7*8;
+    var sy = (n>>6)*10 + 56;
     var width = _fontwidths[n];
     ctx.drawImage(fontimg, sx, sy, width, 10, dx, dy, width, 10);
     dx += width + 1;
@@ -39,6 +49,28 @@ function DrawText(text, dx, dy, ctx) {
   return dx - dx0;
 }
 
+function TextSize(text, widthtable) {
+  var width = 0;
+  for (var i = 0; i < text.length; i++) {
+    var n = text.charCodeAt(i);
+    width += widthtable[n] + 1;
+  }
+  return width;
+}
+
+function DrawBigText(text, dx, dy, ctx) {
+  var dx0 = dx;
+  for (var i = 0; i < text.length; i++) {
+    var n = text.charCodeAt(i);
+    var sx = (n&31)*16;
+    var sy = (n>>5)*20 + 96;
+    var width = _bigfontwidths[n];
+    ctx.drawImage(fontimg, sx, sy, width, 20, dx, dy, width, 20);
+    dx += width + 1;
+  }
+  return dx - dx0;
+}
+
 var _fontmap_notes = [8*5, 8*22, 8*28];
 var _pattern_cellwidth = 16 + 4 + 8 + 4 + 8 + 16 + 4;
 var _scope_width = _pattern_cellwidth - 1;
@@ -203,7 +235,7 @@ function RedrawScreen() {
     for (var j = 0; j < xm.nchan; j++) {
       var x = _pattern_border + j * _pattern_cellwidth;
       // render channel number
-      DrawText(j, x, 1, ctx);
+      DrawText(''+j, x, 1, ctx);
 
       // volume in dB as a green bar
       var vu_y = -Math.log(VU[j])*10;
@@ -219,9 +251,6 @@ function RedrawScreen() {
     }
   }
 
-  var debug = document.getElementById("debug");
-  debug.innerHTML = xm.songname + '<br>pat ' + e.pat + ' row ' + (e.row);
-
   if (e.row != shown_row) {
     var gfx = document.getElementById("gfxpattern");
     if (e.pat != pat_canvas_patnum) {
@@ -988,9 +1017,13 @@ function loadXM(arrayBuf) {
     xm.instruments.push(inst);
   }
 
-  var debug = document.getElementById("debug");
   console.log("loaded \"" + xm.songname + "\"");
-  debug.innerHTML = xm.songname;
+
+  var title = document.getElementById("title");
+  // make title element fit text exactly, then render it
+  title.width = TextSize(xm.songname, _bigfontwidths);
+  var ctx = title.getContext('2d');
+  DrawBigText(xm.songname, 0, 1, ctx);
 
   var instrlist = document.getElementById("instruments");
   var instrcols = ((xm.instruments.length + 7) / 8) | 0;

From 7d6481ad7355751ebfc2d65409389ccbabaa1975 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 4 Nov 2015 10:21:04 -0800
Subject: [PATCH 10/65] file picker!

---
 index.html | 20 ++++++++++----
 xm.js      | 76 +++++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 79 insertions(+), 17 deletions(-)

diff --git a/index.html b/index.html
index c0d7a18..ef7e8e1 100644
--- a/index.html
+++ b/index.html
@@ -2,12 +2,17 @@
   <title>js xm</title>
   <script src="xm.js"></script>
   <script src="xmeffects.js"></script>
+  <script src="http://a1k0n-pub.s3-website-us-west-1.amazonaws.com/xm/xmlist.js"></script>
   <style>
-canvas.centered {
+
+.centered {
   display: block;
   margin-left: auto;
   margin-right: auto;
-};
+}
+
+#filelist a { color: #fff; }
+
   </style>
 </head>
 <body onload="main()">
@@ -16,17 +21,22 @@ canvas.centered {
     <div><canvas class="centered" id='vu' width=224 height=64></canvas></div>
     <div><canvas class="centered" id='gfxpattern' width=640 height=200></canvas></div>
     <div id='instruments'></div>
-    <div><button id='playpause' disabled=true style="width: 100px">Play</button></div>
+    <div>
+      <p style="text-align: center">
+        <button id='playpause' disabled=true style="width: 100px">Play</button>
+        <button id='loadbutton' style="width: 100px">Load</button>
+      </p>
+    </div>
+    <div style="display: none" id='filelist'></div>
   </div>
 <pre>
 code: <a href="http://github.com/a1k0n/jsxm/">github.com/a1k0n/jsxm</a>
 todo:
- - file picker, upload more xms to a host we can access cross-origin
- - render instrument list in ft2 font
  - missing XM effects:
    - E3x, E4x, E5x, E6x, E7x, E9x, EDx, EEx
    - 7xy - tremolo
    - Gxx, Hxy, Kxx, Lxx, Pxy, Txy
+ - render pattern with the wider fonts for fewer channels
 </pre>
 </body>
 
diff --git a/xm.js b/xm.js
index 490f098..13b8a7b 100644
--- a/xm.js
+++ b/xm.js
@@ -794,7 +794,7 @@ function UnrollSampleLoop(samp) {
   samp.type = 1;
 }
 
-function loadXM(arrayBuf) {
+function LoadXM(arrayBuf) {
   var dv = new DataView(arrayBuf);
   var xm = {};
 
@@ -1026,6 +1026,10 @@ function loadXM(arrayBuf) {
   DrawBigText(xm.songname, 0, 1, ctx);
 
   var instrlist = document.getElementById("instruments");
+  // clear instrument list if not already clear
+  while (instrlist.childNodes.length) {
+    instrlist.removeChild(instrlist.childNodes[0]);
+  }
   var instrcols = ((xm.instruments.length + 7) / 8) | 0;
   for (var i = 0; i < instrcols; i++) {
     var canvas = document.createElement('canvas');
@@ -1074,10 +1078,12 @@ var playing = false;
 var jsNode, gainNode;
 var paused_events = [];
 function InitAudio() {
-  audioContext = window.AudioContext || window.webkitAudioContext;
-  audioctx = new audioContext();
-  gainNode = audioctx.createGain();
-  gainNode.gain.value = 0.1;  // master volume
+  if (audioctx == undefined) {
+    audioContext = window.AudioContext || window.webkitAudioContext;
+    audioctx = new audioContext();
+    gainNode = audioctx.createGain();
+    gainNode.gain.value = 0.1;  // master volume
+  }
   jsNode = audioctx.createScriptProcessor(16384, 0, 2);
   jsNode.onaudioprocess = audio_cb;
   gainNode.connect(audioctx.destination);
@@ -1113,19 +1119,25 @@ function PauseXM() {
   playing = false;
 }
 
-function main() {
-  InitAudio();
-  var xmReq = new XMLHttpRequest();
-  var uri = location.search.substr(1);
-  if (uri == "") {
-    uri = "kamel.xm";
+function StopXM() {
+  if (playing) {
+    jsNode.disconnect(gainNode);
+    playing = false;
+    audio_events = [];
+    paused_events = [];
   }
+  cur_songpos = -1, cur_pat = -1, cur_row = 64, cur_ticksamp = 0;
+  InitAudio();
+}
+
+function DownloadXM(uri) {
+  var xmReq = new XMLHttpRequest();
   xmReq.open("GET", uri, true);
   xmReq.responseType = "arraybuffer";
   xmReq.onload = function (xmEvent) {
     var arrayBuffer = xmReq.response;
     if (arrayBuffer) {
-      xm = loadXM(arrayBuffer);
+      xm = LoadXM(arrayBuffer);
     } else {
       console.log("unable to load", uri);
     }
@@ -1133,6 +1145,7 @@ function main() {
     var gfxpattern = document.getElementById("gfxpattern");
     gfxpattern.width = _pattern_cellwidth * xm.nchan + _pattern_border;
     var playbutton = document.getElementById('playpause');
+    playbutton.innerHTML='Play';
     playbutton.onclick = function() {
       if (playing) {
         PauseXM();
@@ -1148,6 +1161,11 @@ function main() {
     for (var i = 0; i < xm.nchan; i++) {
       scopes.push(new Float32Array(_scope_width));
     }
+
+    // reset display
+    shown_row = undefined;
+    pat_canvas_patnum = undefined;
+
     audio_events.push({
       t: 0, row: 0, pat: xm.songpats[0],
       vu: new Float32Array(xm.nchan),
@@ -1158,3 +1176,37 @@ function main() {
   xmReq.send(null);
 }
 
+function InitFilelist() {
+  var el = document.getElementById('filelist');
+  xmuris.forEach(function(entry) {
+    var a = document.createElement('a');
+    a.text = entry[0];
+    a.href = '#'+entry[1];
+    a.onclick = function() {
+      el.style.display = "none";
+      StopXM();
+      DownloadXM(baseuri + entry[1]);
+    }
+    el.appendChild(a);
+    el.appendChild(document.createElement('br'));
+  });
+  var loadbutton = document.getElementById('loadbutton');
+  loadbutton.onclick = function() {
+    if (el.style.display == "none") {
+      el.style.display = "block";
+    } else {
+      el.style.display = "none";
+    }
+  }
+}
+
+function main() {
+  InitAudio();
+  InitFilelist();
+  var uri = location.hash.substr(1);
+  if (uri == "") {
+    uri = "kamel.xm";
+  }
+  DownloadXM(baseuri + uri);
+}
+

From 541a9d721caccf90b1b54c8ce21f4f35900ed99f Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 4 Nov 2015 10:21:27 -0800
Subject: [PATCH 11/65] no longer storing xms in git

---
 kamel.xm | Bin 41995 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 kamel.xm

diff --git a/kamel.xm b/kamel.xm
deleted file mode 100644
index 8766dff138bb3be3759b244db30f3850a5b5d1ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41995
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


From 5aa5c06ab0aa9977bb3f087b53707156bf01a33b Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 4 Nov 2015 10:23:54 -0800
Subject: [PATCH 12/65] update readme

---
 README.md  | 9 ++++-----
 index.html | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e559534..d5bf329 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,13 @@
 
 FastTracker 2 .XM player, written for fun.
 
-[Demo](http://www.a1k0n.net/code/jsxm/) [warning: plays sound immediately on
-load]
+[Demo](http://www.a1k0n.net/code/jsxm/)
 
 By default it plays "my dirty old kamel" by Alexander Bulér aka
 [Zalza](http://zalza.bandcamp.com/). I love this tune, and wrote this code just
-to play it. It can also load other .XMs by loading index.html?_tune-uri.xm_,
-though it either needs to be local to your domain or cross-origin resource
-sharing must be enabled for that to work.
+to play it. It can also load some other tunes hosted on my website with a file
+picker, and it should play just about any .XM file now if checked out and run
+locally.
 
 It is fairly feature-complete, but is missing a bunch of effects.
 
diff --git a/index.html b/index.html
index ef7e8e1..6f95e78 100644
--- a/index.html
+++ b/index.html
@@ -37,6 +37,7 @@ todo:
    - 7xy - tremolo
    - Gxx, Hxy, Kxx, Lxx, Pxy, Txy
  - render pattern with the wider fonts for fewer channels
+ - drag-n-drop .xm files onto player
 </pre>
 </body>
 

From 2cf8840665a4cfc5063d137f1c8d6159c32b2109 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 10 Nov 2015 20:30:41 -0800
Subject: [PATCH 13/65] Contact with the real world

Many, many fixes found after posting this on my website.

 - drag n drop supported
 - plays on OSX and iOS safari now
 - random other hiccups fixed

there seems to be some remaining issues cleaning up when loading a new
song.
---
 index.html |  53 ++++++++++++++++---
 xm.js      | 150 +++++++++++++++++++++++++++++++++++------------------
 2 files changed, 144 insertions(+), 59 deletions(-)

diff --git a/index.html b/index.html
index 6f95e78..19da337 100644
--- a/index.html
+++ b/index.html
@@ -13,22 +13,59 @@
 
 #filelist a { color: #fff; }
 
+.playercontainer {
+  background:#000;
+}
+
+.draghover {
+  background:#000;
+  opacity: 0.5;
+}
+
+.hscroll {
+  overflow: auto;
+  margin-bottom: 14px;
+}
+
+.hscroll::-webkit-scrollbar {
+    -webkit-appearance: none;
+}
+
+.hscroll::-webkit-scrollbar:horizontal {
+    height: 11px;
+}
+
+.hscroll::-webkit-scrollbar-thumb {
+    border-radius: 2px;
+    border: 1px solid #93C3E9; /* should match background, can't be transparent */
+    background-color: #A0D4FD;
+}
+
+.hscroll::-webkit-scrollbar-track {
+    background-color: #333;
+    border-radius: 8px;
+}
+
   </style>
 </head>
-<body onload="main()">
-  <div style="background:#000">
-    <div><canvas class="centered" id='title' width=640 height=22></canvas></div>
-    <div><canvas class="centered" id='vu' width=224 height=64></canvas></div>
-    <div><canvas class="centered" id='gfxpattern' width=640 height=200></canvas></div>
+<body>
+  <div id="playercontainer" class="playercontainer" ondrop="handleDrop(event)"
+      ondragover="allowDrop(event)" ondragleave="allowDrop(event)">
+    <div><canvas class="centered" id='title' width="640" height="22"></canvas></div>
+    <div class="hscroll">
+      <div><canvas class="centered" id='vu' width="224" height="64"></canvas></div>
+      <div><canvas class="centered" id='gfxpattern' width="640" height="200"></canvas></div>
+    </div>
     <div id='instruments'></div>
     <div>
       <p style="text-align: center">
-        <button id='playpause' disabled=true style="width: 100px">Play</button>
-        <button id='loadbutton' style="width: 100px">Load</button>
+        <button id="playpause" disabled="true" style="width: 100px; background: #ccc;">Play</button>
+        <button id="loadbutton" style="width: 100px; background: #ccc">Load</button>
       </p>
     </div>
     <div style="display: none" id='filelist'></div>
   </div>
+
 <pre>
 code: <a href="http://github.com/a1k0n/jsxm/">github.com/a1k0n/jsxm</a>
 todo:
@@ -37,7 +74,7 @@ todo:
    - 7xy - tremolo
    - Gxx, Hxy, Kxx, Lxx, Pxy, Txy
  - render pattern with the wider fonts for fewer channels
- - drag-n-drop .xm files onto player
+ - fix occasional rendering/audio hiccups when switching songs
 </pre>
 </body>
 
diff --git a/xm.js b/xm.js
index 13b8a7b..6bd8e26 100644
--- a/xm.js
+++ b/xm.js
@@ -243,11 +243,13 @@ function RedrawScreen() {
 
       // oscilloscope
       var scope = scopes[j];
-      ctx.beginPath();
-      for (var k = 0; k < _scope_width; k++) {
-        ctx.lineTo(x + 1 + k, 32 - 16 * scope[k]);
+      if (scope != undefined) {
+        ctx.beginPath();
+        for (var k = 0; k < _scope_width; k++) {
+          ctx.lineTo(x + 1 + k, 32 - 16 * scope[k]);
+        }
+        ctx.stroke();
       }
-      ctx.stroke();
     }
   }
 
@@ -753,10 +755,10 @@ function ConvertSample(array, bits) {
     len /= 2;
     var samp = new Float32Array(len);
     for (var k = 0; k < len; k++) {
-      acc += array[k*2] + (array[k*2 + 1] << 8);
-      var b = acc&65535;
+      var b = array[k*2] + (array[k*2 + 1] << 8);
       if (b & 32768) b = b-65536;
-      samp[k] = b / 32768.0;
+      acc = Math.max(-1, Math.min(1, acc + b / 32768.0));
+      samp[k] = acc;
     }
     return samp;
   }
@@ -766,7 +768,6 @@ function ConvertSample(array, bits) {
 // uninterrupted for as long as possible; this also handles pingpong loops.
 function UnrollSampleLoop(samp) {
   var nloops = ((2048 + samp.looplen - 1) / samp.looplen) | 0;
-  console.log(samp.looplen, nloops);
   var pingpong = samp.type & 2;
   if (pingpong) {
     // make sure we have an even number of loops if we are pingponging
@@ -896,9 +897,7 @@ function LoadXM(arrayBuf) {
       'number': i,
     };
     if (nsamp > 0) {
-      // return a slice so we have a fresh copy and don't retain pointers to
-      // the original xm file arraybuf forever
-      var samplemap = new Uint8Array(arrayBuf, idx+33, 96).slice();
+      var samplemap = new Uint8Array(arrayBuf, idx+33, 96);
 
       var env_nvol = dv.getUint8(idx+225);
       var env_vol_type = dv.getUint8(idx+233);
@@ -1074,21 +1073,25 @@ function LoadXM(arrayBuf) {
   return xm;
 }
 
-var playing = false;
 var jsNode, gainNode;
-var paused_events = [];
 function InitAudio() {
   if (audioctx == undefined) {
-    audioContext = window.AudioContext || window.webkitAudioContext;
+    var audioContext = window.AudioContext || window.webkitAudioContext;
     audioctx = new audioContext();
     gainNode = audioctx.createGain();
     gainNode.gain.value = 0.1;  // master volume
   }
-  jsNode = audioctx.createScriptProcessor(16384, 0, 2);
+  if (audioctx.createScriptProcessor == undefined) {
+    jsNode = audioctx.createJavaScriptNode(16384, 0, 2);
+  } else {
+    jsNode = audioctx.createScriptProcessor(16384, 0, 2);
+  }
   jsNode.onaudioprocess = audio_cb;
   gainNode.connect(audioctx.destination);
 }
 
+var playing = false;
+var paused_events = [];
 function PlayXM() {
   if (!playing) {
     // put paused events back into action, if any
@@ -1100,6 +1103,17 @@ function PlayXM() {
     }
     // start playing
     jsNode.connect(gainNode);
+
+    // hack to get iOS to play anything
+    var temp_osc = audioctx.createOscillator();
+    temp_osc.connect(audioctx.destination);
+    if (temp_osc.noteOn) temp_osc.start = temp_osc.noteOn;
+    temp_osc.frequency.value = 1;
+    temp_osc.start(0);
+    window.setTimeout(10, function() {
+      temp_osc.disconnect();
+    });
+
     requestAnimationFrame(RedrawScreen);
   }
   playing = true;
@@ -1108,7 +1122,7 @@ function PlayXM() {
 function PauseXM() {
   if (playing) {
     jsNode.disconnect(gainNode);
-    // grab all the audio events 
+    // grab all the audio events
     var t = audioctx.currentTime;
     while (audio_events.length > 0) {
       var e = audio_events.shift();
@@ -1130,6 +1144,45 @@ function StopXM() {
   InitAudio();
 }
 
+function LoadXMAndInit(xmdata) {
+  xm = LoadXM(xmdata);
+  if (!xm) return;
+
+  document.getElementById('vu').width = _pattern_border + _pattern_cellwidth * xm.nchan;
+  var gfxpattern = document.getElementById("gfxpattern");
+  gfxpattern.width = _pattern_cellwidth * xm.nchan + _pattern_border;
+  var playbutton = document.getElementById('playpause');
+  playbutton.innerHTML='Play';
+  playbutton.onclick = function() {
+    if (playing) {
+      PauseXM();
+      playbutton.innerHTML='Play';
+    } else {
+      PlayXM();
+      playbutton.innerHTML='Pause';
+    }
+  }
+  playbutton.disabled = false;
+  // generate a fake audio event to render the initial paused screen
+  var scopes = [];
+  for (var i = 0; i < xm.nchan; i++) {
+    scopes.push(new Float32Array(_scope_width));
+  }
+
+  // reset display
+  shown_row = undefined;
+  pat_canvas_patnum = undefined;
+
+  audio_events.push({
+    t: 0, row: 0, pat: xm.songpats[0],
+    vu: new Float32Array(xm.nchan),
+    scopes: scopes
+  });
+  RedrawScreen();
+
+  return xm;
+}
+
 function DownloadXM(uri) {
   var xmReq = new XMLHttpRequest();
   xmReq.open("GET", uri, true);
@@ -1137,45 +1190,37 @@ function DownloadXM(uri) {
   xmReq.onload = function (xmEvent) {
     var arrayBuffer = xmReq.response;
     if (arrayBuffer) {
-      xm = LoadXM(arrayBuffer);
+      xm = LoadXMAndInit(arrayBuffer);
     } else {
       console.log("unable to load", uri);
     }
-    document.getElementById('vu').width = _pattern_border + _pattern_cellwidth * xm.nchan;
-    var gfxpattern = document.getElementById("gfxpattern");
-    gfxpattern.width = _pattern_cellwidth * xm.nchan + _pattern_border;
-    var playbutton = document.getElementById('playpause');
-    playbutton.innerHTML='Play';
-    playbutton.onclick = function() {
-      if (playing) {
-        PauseXM();
-        playbutton.innerHTML='Play';
-      } else {
-        PlayXM();
-        playbutton.innerHTML='Pause';
-      }
-    }
-    playbutton.disabled = false;
-    // generate a fake audio event to render the initial paused screen
-    var scopes = [];
-    for (var i = 0; i < xm.nchan; i++) {
-      scopes.push(new Float32Array(_scope_width));
-    }
-
-    // reset display
-    shown_row = undefined;
-    pat_canvas_patnum = undefined;
-
-    audio_events.push({
-      t: 0, row: 0, pat: xm.songpats[0],
-      vu: new Float32Array(xm.nchan),
-      scopes: scopes
-    });
-    RedrawScreen();
   }
   xmReq.send(null);
 }
 
+function allowDrop(ev) {
+  ev.stopPropagation();
+  ev.preventDefault();
+  var elem = document.getElementById("playercontainer");
+  elem.className = (ev.type == "dragover" ? "draghover" : "playercontainer");
+  return false;
+}
+
+function handleDrop(e) {
+  console.log(e);
+  e.preventDefault();
+  var elem = document.getElementById("playercontainer");
+  elem.className = "playercontainer";
+  var files = e.target.files || e.dataTransfer.files;
+  if (files.length < 1) return false;
+  var reader = new FileReader();
+  reader.onload = function(e) {
+    LoadXMAndInit(e.target.result);
+  }
+  reader.readAsArrayBuffer(files[0]);
+  return false;
+}
+
 function InitFilelist() {
   var el = document.getElementById('filelist');
   xmuris.forEach(function(entry) {
@@ -1200,13 +1245,16 @@ function InitFilelist() {
   }
 }
 
-function main() {
+window.onload = function() {
   InitAudio();
   InitFilelist();
+
   var uri = location.hash.substr(1);
   if (uri == "") {
     uri = "kamel.xm";
   }
-  DownloadXM(baseuri + uri);
+  if (!uri.startsWith("http")) {
+    uri = baseuri + uri;
+  }
+  DownloadXM(uri);
 }
-

From 41e8713b7499eef99fce69401eb13e627cc87225 Mon Sep 17 00:00:00 2001
From: luckcolors <luckcolorsgoo@gmail.com>
Date: Wed, 11 Nov 2015 22:28:21 +0100
Subject: [PATCH 14/65] First commit for desktop app Nw.js

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 package.json

diff --git a/package.json b/package.json
new file mode 100644
index 0000000..cbcc2e9
--- /dev/null
+++ b/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "jsxm",
+  "main": "index.html"
+}

From 14d88e9a101740261befb5bbc1cbffc8495fc7ff Mon Sep 17 00:00:00 2001
From: luckcolors <luckcolorsgoo@gmail.com>
Date: Wed, 11 Nov 2015 22:49:25 +0100
Subject: [PATCH 15/65] Removed toolbar.

---
 package.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cbcc2e9..96863a7 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,11 @@
 {
   "name": "jsxm",
-  "main": "index.html"
+  "version": "1",
+  "main": "index.html",
+  "window": {
+    "frame": true,
+    "toolbar": false,
+    "position": "center",
+    "resizable": true
+  }
 }

From a37555ed5882379255f402154c0b0b9467bb7ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Thu, 12 Nov 2015 00:00:43 +0100
Subject: [PATCH 16/65] Reorder to load without any issues

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 19da337..b83e85e 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,8 @@
 <head>
   <title>js xm</title>
-  <script src="xm.js"></script>
-  <script src="xmeffects.js"></script>
   <script src="http://a1k0n-pub.s3-website-us-west-1.amazonaws.com/xm/xmlist.js"></script>
+  <script src="xmeffects.js"></script>
+  <script src="xm.js"></script>
   <style>
 
 .centered {

From ea36dceb5592d473315ddfbc7cf5cecaaf7c03ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Thu, 12 Nov 2015 00:03:26 +0100
Subject: [PATCH 17/65] Wrap in IIFE and namespace any shared info

---
 index.html   |   4 +-
 xm.js        | 172 ++++++++++++++++++++++++++++-----------------------
 xmeffects.js |  43 +++++++------
 3 files changed, 120 insertions(+), 99 deletions(-)

diff --git a/index.html b/index.html
index b83e85e..e54e71d 100644
--- a/index.html
+++ b/index.html
@@ -49,8 +49,8 @@
   </style>
 </head>
 <body>
-  <div id="playercontainer" class="playercontainer" ondrop="handleDrop(event)"
-      ondragover="allowDrop(event)" ondragleave="allowDrop(event)">
+  <div id="playercontainer" class="playercontainer" ondrop="XMPlayer.handleDrop(event)"
+      ondragover="XMPlayer.allowDrop(event)" ondragleave="XMPlayer.allowDrop(event)">
     <div><canvas class="centered" id='title' width="640" height="22"></canvas></div>
     <div class="hscroll">
       <div><canvas class="centered" id='vu' width="224" height="64"></canvas></div>
diff --git a/xm.js b/xm.js
index 6bd8e26..59465d7 100644
--- a/xm.js
+++ b/xm.js
@@ -1,4 +1,19 @@
-var xm;  // contains all song data
+(function (window, document) {
+if (!window.XMPlayer) {
+  window.XMPlayer = {};
+}
+var player = window.XMPlayer;
+player.allowDrop = allowDrop;
+player.handleDrop = handleDrop;
+player.PeriodForNote = PeriodForNote;
+player.prettify_effect = prettify_effect;
+player.cur_songpos = -1;
+player.cur_pat = -1;
+player.cur_row = 64;
+player.cur_ticksamp = 0;
+player.cur_tick = 6;
+player.xm = {}; // contains all song data
+
 var audioctx;  // AudioContext
 
 // Load font (ripped from FastTracker 2)
@@ -232,7 +247,7 @@ function RedrawScreen() {
     ctx.fillRect(0, 0, canvas.width, 64);
     ctx.fillStyle = '#0f0';
     ctx.strokeStyle = '#55acff';
-    for (var j = 0; j < xm.nchan; j++) {
+    for (var j = 0; j < player.xm.nchan; j++) {
       var x = _pattern_border + j * _pattern_cellwidth;
       // render channel number
       DrawText(''+j, x, 1, ctx);
@@ -256,9 +271,9 @@ function RedrawScreen() {
   if (e.row != shown_row) {
     var gfx = document.getElementById("gfxpattern");
     if (e.pat != pat_canvas_patnum) {
-      var p = xm.patterns[e.pat];
+      var p = player.xm.patterns[e.pat];
       if (p != undefined) {
-        RenderPattern(pat_canvas, xm.patterns[e.pat]);
+        RenderPattern(pat_canvas, player.xm.patterns[e.pat]);
         pat_canvas_patnum = e.pat;
       }
     }
@@ -279,26 +294,24 @@ function RedrawScreen() {
   }
 }
 
-var cur_songpos = -1, cur_pat = -1, cur_row = 64, cur_ticksamp = 0;
-var cur_tick = 6;
 function next_row() {
-  if (cur_pat == -1 || cur_row >= xm.patterns[cur_pat].length) {
-    cur_row = 0;
-    cur_songpos++;
-    if (cur_songpos >= xm.songpats.length)
-      cur_songpos = xm.song_looppos;
-    cur_pat = xm.songpats[cur_songpos];
+  if (player.cur_pat == -1 || player.cur_row >= player.xm.patterns[player.cur_pat].length) {
+    player.cur_row = 0;
+    player.cur_songpos += 1;
+    if (player.cur_songpos >= player.xm.songpats.length)
+      player.cur_songpos = player.xm.song_looppos;
+    player.cur_pat = player.xm.songpats[player.cur_songpos];
   }
-  var p = xm.patterns[cur_pat];
-  var r = p[cur_row];
-  cur_row++;
+  var p = player.xm.patterns[player.cur_pat];
+  var r = p[player.cur_row];
+  player.cur_row += 1;
   for (var i = 0; i < r.length; i++) {
-    var ch = xm.channelinfo[i];
+    var ch = player.xm.channelinfo[i];
     var inst = ch.inst;
     var triggernote = false;
     // instrument trigger
     if (r[i][1] != -1) {
-      inst = xm.instruments[r[i][1] - 1];
+      inst = player.xm.instruments[r[i][1] - 1];
       if (inst && inst.samplemap) {
         ch.inst = inst;
         // retrigger unless overridden below
@@ -364,8 +377,8 @@ function next_row() {
     ch.effect = r[i][3];
     ch.effectdata = r[i][4];
     if (ch.effect < 36) {
-      ch.effectfn = effects_t1[ch.effect];
-      var eff_t0 = effects_t0[ch.effect];
+      ch.effectfn = player.effects_t1[ch.effect];
+      var eff_t0 = player.effects_t0[ch.effect];
       if (eff_t0 && eff_t0(ch, ch.effectdata)) {
         triggernote = false;
       }
@@ -460,26 +473,26 @@ EnvelopeFollower.prototype.Tick = function(release) {
 }
 
 function next_tick() {
-  cur_tick++;
-  if (cur_tick >= xm.tempo) {
-    cur_tick = 0;
+  player.cur_tick += 1;
+  if (player.cur_tick >= player.xm.tempo) {
+    player.cur_tick = 0;
     next_row();
   }
-  for (var j = 0; j < xm.nchan; j++) {
-    var ch = xm.channelinfo[j];
+  for (var j = 0; j < player.xm.nchan; j++) {
+    var ch = player.xm.channelinfo[j];
     var inst = ch.inst;
     ch.periodoffset = 0;
-    if (cur_tick != 0) {
+    if (player.cur_tick != 0) {
       if(ch.voleffectfn) ch.voleffectfn(ch);
       if(ch.effectfn) ch.effectfn(ch);
     }
     if (isNaN(ch.period)) {
-      console.log(prettify_notedata(xm.patterns[cur_pat][cur_row-1][j]),
+      console.log(prettify_notedata(player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
           "set channel", j, "period to NaN");
     }
     if (inst == undefined) continue;
     if (ch.env_vol == undefined) {
-      console.log(prettify_notedata(xm.patterns[cur_pat][cur_row-1][j]),
+      console.log(prettify_notedata(player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
           "set channel", j, "env_vol to undefined, but note is playing");
       continue;
     }
@@ -691,17 +704,17 @@ function audio_cb(e) {
   }
 
   var offset = 0;
-  var ticklen = 0|(f_smp * 2.5 / xm.bpm);
+  var ticklen = 0|(f_smp * 2.5 / player.xm.bpm);
 
   while(buflen > 0) {
-    if (cur_pat == -1 || cur_ticksamp >= ticklen) {
+    if (player.cur_pat == -1 || player.cur_ticksamp >= ticklen) {
       next_tick(f_smp);
-      cur_ticksamp -= ticklen;
+      player.cur_ticksamp -= ticklen;
     }
-    var tickduration = Math.min(buflen, ticklen - cur_ticksamp);
-    var VU = new Float32Array(xm.nchan);
+    var tickduration = Math.min(buflen, ticklen - player.cur_ticksamp);
+    var VU = new Float32Array(player.xm.nchan);
     var scopes = undefined;
-    for (var j = 0; j < xm.nchan; j++) {
+    for (var j = 0; j < player.xm.nchan; j++) {
       var scope;
       if (tickduration >= 4*_scope_width) {
         scope = new Float32Array(_scope_width);
@@ -711,7 +724,7 @@ function audio_cb(e) {
       }
 
       VU[j] = MixChannelIntoBuf(
-          xm.channelinfo[j], offset, offset + tickduration, dataL, dataR) /
+          player.xm.channelinfo[j], offset, offset + tickduration, dataL, dataR) /
         tickduration;
 
       if (tickduration >= 4*_scope_width) {
@@ -726,15 +739,15 @@ function audio_cb(e) {
       t: e.playbackTime + (0.0 + offset) / f_smp,
       vu: VU,
       scopes: scopes,
-      songpos: cur_songpos,
-      pat: cur_pat,
-      row: cur_row - 1
+      songpos: player.cur_songpos,
+      pat: player.cur_pat,
+      row: player.cur_row - 1
     });
     if (audio_events.length == 1) {
       requestAnimationFrame(RedrawScreen);
     }
     offset += tickduration;
-    cur_ticksamp += tickduration;
+    player.cur_ticksamp += tickduration;
     buflen -= tickduration;
   }
 }
@@ -797,22 +810,22 @@ function UnrollSampleLoop(samp) {
 
 function LoadXM(arrayBuf) {
   var dv = new DataView(arrayBuf);
-  var xm = {};
+  player.xm = {};
 
-  xm.songname = getstring(dv, 17, 20);
+  player.xm.songname = getstring(dv, 17, 20);
   var hlen = dv.getUint32(0x3c, true) + 0x3c;
   var songlen = dv.getUint16(0x40, true);
-  xm.song_looppos = dv.getUint16(0x42, true);
-  xm.nchan = dv.getUint16(0x44, true);
+  player.xm.song_looppos = dv.getUint16(0x42, true);
+  player.xm.nchan = dv.getUint16(0x44, true);
   var npat = dv.getUint16(0x46, true);
   var ninst = dv.getUint16(0x48, true);
-  xm.flags = dv.getUint16(0x4a, true);
-  xm.tempo = dv.getUint16(0x4c, true);
-  xm.bpm = dv.getUint16(0x4e, true);
-  xm.channelinfo = [];
+  player.xm.flags = dv.getUint16(0x4a, true);
+  player.xm.tempo = dv.getUint16(0x4c, true);
+  player.xm.bpm = dv.getUint16(0x4e, true);
+  player.xm.channelinfo = [];
 
-  for (var i = 0; i < xm.nchan; i++) {
-    xm.channelinfo.push({
+  for (var i = 0; i < player.xm.nchan; i++) {
+    player.xm.channelinfo.push({
       number: i,
       filterstate: new Float32Array(3),
       vol: 0,
@@ -829,18 +842,18 @@ function LoadXM(arrayBuf) {
   }
   console.log("header len " + hlen);
 
-  console.log("songlen %d, %d channels, %d patterns, %d instruments", songlen, xm.nchan, npat, ninst);
-  console.log("loop @%d", xm.song_looppos);
-  console.log("flags=%d tempo %d bpm %d", xm.flags, xm.tempo, xm.bpm);
+  console.log("songlen %d, %d channels, %d patterns, %d instruments", songlen, player.xm.nchan, npat, ninst);
+  console.log("loop @%d", player.xm.song_looppos);
+  console.log("flags=%d tempo %d bpm %d", player.xm.flags, player.xm.tempo, player.xm.bpm);
 
-  xm.songpats = [];
+  player.xm.songpats = [];
   for (var i = 0; i < songlen; i++) {
-    xm.songpats.push(dv.getUint8(0x50 + i));
+    player.xm.songpats.push(dv.getUint8(0x50 + i));
   }
-  console.log("song patterns: ", xm.songpats);
+  console.log("song patterns: ", player.xm.songpats);
 
   var idx = hlen;
-  xm.patterns = [];
+  player.xm.patterns = [];
   for (var i = 0; i < npat; i++) {
     var pattern = [];
     var patheaderlen = dv.getUint32(idx, true);
@@ -850,7 +863,7 @@ function LoadXM(arrayBuf) {
     idx += 9;
     for (var j = 0; patsize > 0 && j < patrows; j++) {
       row = [];
-      for (var k = 0; k < xm.nchan; k++) {
+      for (var k = 0; k < player.xm.nchan; k++) {
         var byte0 = dv.getUint8(idx); idx++;
         var note = -1, inst = -1, vol = -1, efftype = 0, effparam = 0;
         if (byte0 & 0x80) {
@@ -883,10 +896,10 @@ function LoadXM(arrayBuf) {
       }
       pattern.push(row);
     }
-    xm.patterns.push(pattern);
+    player.xm.patterns.push(pattern);
   }
 
-  xm.instruments = [];
+  player.xm.instruments = [];
   // now load instruments
   for (i = 0; i < ninst; i++) {
     var hdrsiz = dv.getUint32(idx, true);
@@ -1013,23 +1026,23 @@ function LoadXM(arrayBuf) {
       idx += hdrsiz;
       console.log("empty instrument", i, hdrsiz, idx);
     }
-    xm.instruments.push(inst);
+    player.xm.instruments.push(inst);
   }
 
-  console.log("loaded \"" + xm.songname + "\"");
+  console.log("loaded \"" + player.xm.songname + "\"");
 
   var title = document.getElementById("title");
   // make title element fit text exactly, then render it
-  title.width = TextSize(xm.songname, _bigfontwidths);
+  title.width = TextSize(player.xm.songname, _bigfontwidths);
   var ctx = title.getContext('2d');
-  DrawBigText(xm.songname, 0, 1, ctx);
+  DrawBigText(player.xm.songname, 0, 1, ctx);
 
   var instrlist = document.getElementById("instruments");
   // clear instrument list if not already clear
   while (instrlist.childNodes.length) {
     instrlist.removeChild(instrlist.childNodes[0]);
   }
-  var instrcols = ((xm.instruments.length + 7) / 8) | 0;
+  var instrcols = ((player.xm.instruments.length + 7) / 8) | 0;
   for (var i = 0; i < instrcols; i++) {
     var canvas = document.createElement('canvas');
     var ctx = canvas.getContext('2d');
@@ -1039,11 +1052,11 @@ function LoadXM(arrayBuf) {
     ctx.fillStyle = '#000';
     ctx.fillRect(0, 0, canvas.width, canvas.height);
     var hasname = 0, hasdata = 0;
-    for (var j = 8*i; j < Math.min(8*i+8, xm.instruments.length); j++) {
+    for (var j = 8*i; j < Math.min(8*i+8, player.xm.instruments.length); j++) {
       var y = 10*(j - 8*i);
       var n = (j+1).toString(16);
       if (j < 15) n = '0' + n;
-      var data = xm.instruments[j].samples;
+      var data = player.xm.instruments[j].samples;
       if (data) {
         var len = data[0].len;
         data = data[0].sampledata;
@@ -1056,11 +1069,11 @@ function LoadXM(arrayBuf) {
         ctx.stroke();
         hasdata++;
       }
-      var name = xm.instruments[j].name;
+      var name = player.xm.instruments[j].name;
       ctx.globalCompositeOperation = 'lighten';
       DrawText(n, 1, y, ctx);
       if (name != '') {
-        DrawText(xm.instruments[j].name, 20, y, ctx);
+        DrawText(player.xm.instruments[j].name, 20, y, ctx);
         hasname++;
       }
       ctx.globalCompositeOperation = 'source-over';
@@ -1070,7 +1083,7 @@ function LoadXM(arrayBuf) {
     }
   }
 
-  return xm;
+  return player.xm;
 }
 
 var jsNode, gainNode;
@@ -1110,7 +1123,7 @@ function PlayXM() {
     if (temp_osc.noteOn) temp_osc.start = temp_osc.noteOn;
     temp_osc.frequency.value = 1;
     temp_osc.start(0);
-    window.setTimeout(10, function() {
+    setTimeout(10, function() {
       temp_osc.disconnect();
     });
 
@@ -1140,17 +1153,17 @@ function StopXM() {
     audio_events = [];
     paused_events = [];
   }
-  cur_songpos = -1, cur_pat = -1, cur_row = 64, cur_ticksamp = 0;
+  player.cur_songpos = -1, player.cur_pat = -1, player.cur_row = 64, player.cur_ticksamp = 0;
   InitAudio();
 }
 
 function LoadXMAndInit(xmdata) {
-  xm = LoadXM(xmdata);
-  if (!xm) return;
+  player.xm = LoadXM(xmdata);
+  if (!player.xm) return;
 
-  document.getElementById('vu').width = _pattern_border + _pattern_cellwidth * xm.nchan;
+  document.getElementById('vu').width = _pattern_border + _pattern_cellwidth * player.xm.nchan;
   var gfxpattern = document.getElementById("gfxpattern");
-  gfxpattern.width = _pattern_cellwidth * xm.nchan + _pattern_border;
+  gfxpattern.width = _pattern_cellwidth * player.xm.nchan + _pattern_border;
   var playbutton = document.getElementById('playpause');
   playbutton.innerHTML='Play';
   playbutton.onclick = function() {
@@ -1165,7 +1178,7 @@ function LoadXMAndInit(xmdata) {
   playbutton.disabled = false;
   // generate a fake audio event to render the initial paused screen
   var scopes = [];
-  for (var i = 0; i < xm.nchan; i++) {
+  for (var i = 0; i < player.xm.nchan; i++) {
     scopes.push(new Float32Array(_scope_width));
   }
 
@@ -1174,13 +1187,13 @@ function LoadXMAndInit(xmdata) {
   pat_canvas_patnum = undefined;
 
   audio_events.push({
-    t: 0, row: 0, pat: xm.songpats[0],
-    vu: new Float32Array(xm.nchan),
+    t: 0, row: 0, pat: player.xm.songpats[0],
+    vu: new Float32Array(player.xm.nchan),
     scopes: scopes
   });
   RedrawScreen();
 
-  return xm;
+  return player.xm;
 }
 
 function DownloadXM(uri) {
@@ -1190,7 +1203,7 @@ function DownloadXM(uri) {
   xmReq.onload = function (xmEvent) {
     var arrayBuffer = xmReq.response;
     if (arrayBuffer) {
-      xm = LoadXMAndInit(arrayBuffer);
+      player.xm = LoadXMAndInit(arrayBuffer);
     } else {
       console.log("unable to load", uri);
     }
@@ -1258,3 +1271,4 @@ window.onload = function() {
   }
   DownloadXM(uri);
 }
+})(window, document);
\ No newline at end of file
diff --git a/xmeffects.js b/xmeffects.js
index 38515d9..66819ba 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -1,8 +1,14 @@
+(function (window) {
+if (!window.XMPlayer) {
+  window.XMPlayer = {};
+}
+var player = window.XMPlayer;
+
 function eff_t1_0(ch) {  // arpeggio
   if (ch.effectdata != 0 && ch.inst != undefined) {
     var arpeggio = [0, ch.effectdata>>4, ch.effectdata&15];
-    var note = ch.note + arpeggio[cur_tick % 3];
-    ch.period = PeriodForNote(ch, note);
+    var note = ch.note + arpeggio[player.cur_tick % 3];
+    ch.period = player.PeriodForNote(ch, note);
   }
 }
 
@@ -103,9 +109,9 @@ function eff_t1_a(ch) {  // volume slide
 }
 
 function eff_t0_b(ch, data) {  // song jump (untested)
-  if (data < xm.songpats.length) {
-    cur_songpos = data
-    cur_pat = xm.songpats[cur_songpos];
+  if (data < player.xm.songpats.length) {
+    player.cur_songpos = data;
+    player.cur_pat = player.xm.songpats[player.cur_songpos];
   }
 }
 
@@ -114,11 +120,11 @@ function eff_t0_c(ch, data) {  // set volume
 }
 
 function eff_t0_d(ch, data) {  // pattern jump
-  cur_songpos++;
-  if (cur_songpos >= xm.songpats.length)
-    cur_songpos = xm.song_looppos;
-  cur_pat = xm.songpats[cur_songpos];
-  cur_row = data;
+  player.cur_songpos += 1;
+  if (player.cur_songpos >= player.xm.songpats.length)
+    player.cur_songpos = player.xm.song_looppos;
+  player.cur_pat = player.xm.songpats[player.cur_songpos];
+  player.cur_row = data;
 }
 
 function eff_t0_e(ch, data) {  // extended effects!
@@ -157,7 +163,7 @@ function eff_t0_e(ch, data) {  // extended effects!
 function eff_t1_e(ch) {  // note cut
   switch (ch.effectdata >> 4) {
     case 0x0c:
-      if (cur_tick == (ch.effectdata & 0x0f)) {
+      if (player.cur_tick == (ch.effectdata & 0x0f)) {
         ch.vol = 0;
       }
       break;
@@ -168,10 +174,10 @@ function eff_t0_f(ch, data) {  // set tempo
   if (data == 0) {
     console.log("tempo 0?");
     return;
-  } else if(data < 0x20) {
-    xm.tempo = data;
+  } else if (data < 0x20) {
+    player.xm.tempo = data;
   } else {
-    xm.bpm = data;
+    player.xm.bpm = data;
   }
 }
 
@@ -200,17 +206,17 @@ function eff_t0_r(ch, data) {  // retrigger
 }
 
 function eff_t1_r(ch) {
-  if (cur_tick % (ch.retrig & 0x0f) == 0) {
+  if (player.cur_tick % (ch.retrig & 0x0f) == 0) {
     ch.off = 0;
   }
 }
 
 function eff_unimplemented() {}
 function eff_unimplemented_t0(ch, data) {
-  console.log("unimplemented effect", prettify_effect(ch.effect, data));
+  console.log("unimplemented effect", player.prettify_effect(ch.effect, data));
 }
 
-var effects_t0 = [  // effect functions on tick 0
+player.effects_t0 = [  // effect functions on tick 0
   eff_t1_0,  // 1, arpeggio is processed on all ticks
   eff_t0_1,
   eff_t0_2,
@@ -249,7 +255,7 @@ var effects_t0 = [  // effect functions on tick 0
   eff_unimplemented_t0,  // z
 ];
 
-var effects_t1 = [  // effect functions on tick 1+
+player.effects_t1 = [  // effect functions on tick 1+
   eff_t1_0,
   eff_t1_1,
   eff_t1_2,
@@ -287,3 +293,4 @@ var effects_t1 = [  // effect functions on tick 1+
   eff_unimplemented,  // y
   eff_unimplemented   // z
 ];
+})(window || {});
\ No newline at end of file

From 7aa67803ed2407ee9ec32ab3c9435ec194225eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Thu, 12 Nov 2015 01:04:59 +0100
Subject: [PATCH 18/65] Use postfix increment operator

---
 xm.js        | 6 +++---
 xmeffects.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xm.js b/xm.js
index 59465d7..8830798 100644
--- a/xm.js
+++ b/xm.js
@@ -297,14 +297,14 @@ function RedrawScreen() {
 function next_row() {
   if (player.cur_pat == -1 || player.cur_row >= player.xm.patterns[player.cur_pat].length) {
     player.cur_row = 0;
-    player.cur_songpos += 1;
+    player.cur_songpos++;
     if (player.cur_songpos >= player.xm.songpats.length)
       player.cur_songpos = player.xm.song_looppos;
     player.cur_pat = player.xm.songpats[player.cur_songpos];
   }
   var p = player.xm.patterns[player.cur_pat];
   var r = p[player.cur_row];
-  player.cur_row += 1;
+  player.cur_row++;
   for (var i = 0; i < r.length; i++) {
     var ch = player.xm.channelinfo[i];
     var inst = ch.inst;
@@ -473,7 +473,7 @@ EnvelopeFollower.prototype.Tick = function(release) {
 }
 
 function next_tick() {
-  player.cur_tick += 1;
+  player.cur_tick++;
   if (player.cur_tick >= player.xm.tempo) {
     player.cur_tick = 0;
     next_row();
diff --git a/xmeffects.js b/xmeffects.js
index 66819ba..1838981 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -120,7 +120,7 @@ function eff_t0_c(ch, data) {  // set volume
 }
 
 function eff_t0_d(ch, data) {  // pattern jump
-  player.cur_songpos += 1;
+  player.cur_songpos++;
   if (player.cur_songpos >= player.xm.songpats.length)
     player.cur_songpos = player.xm.song_looppos;
   player.cur_pat = player.xm.songpats[player.cur_songpos];

From 664686f199c53fda732f29909cebc880073efb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Thu, 12 Nov 2015 01:05:59 +0100
Subject: [PATCH 19/65] Add newlines

---
 xm.js        | 2 +-
 xmeffects.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xm.js b/xm.js
index 8830798..73adf5c 100644
--- a/xm.js
+++ b/xm.js
@@ -1271,4 +1271,4 @@ window.onload = function() {
   }
   DownloadXM(uri);
 }
-})(window, document);
\ No newline at end of file
+})(window, document);
diff --git a/xmeffects.js b/xmeffects.js
index 1838981..bc9a9aa 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -293,4 +293,4 @@ player.effects_t1 = [  // effect functions on tick 1+
   eff_unimplemented,  // y
   eff_unimplemented   // z
 ];
-})(window || {});
\ No newline at end of file
+})(window || {});

From 1667ab502b073638edbf81398e05127d36f81c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Thu, 12 Nov 2015 01:09:20 +0100
Subject: [PATCH 20/65] Add window fallback

---
 xm.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xm.js b/xm.js
index 73adf5c..c55ac4f 100644
--- a/xm.js
+++ b/xm.js
@@ -1271,4 +1271,4 @@ window.onload = function() {
   }
   DownloadXM(uri);
 }
-})(window, document);
+})(window || {}, document);

From 8e114a16da95a5fea14e75a32180d32dcb7d79a3 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 11 Nov 2015 18:00:21 -0800
Subject: [PATCH 21/65] Split viewer code into trackview.js

Also disabled iOS hack, as it seems to be causing issues, and fixed a
minor drag-n-drop bug (wouldn't load if track was already playing past
length of newly loaded track).

To play without a viewer, you still have to stub it out. Not sure the
best way to handle that case yet.
---
 index.html   |   1 +
 trackview.js | 334 ++++++++++++++++++++++++++++++++
 xm.js        | 525 +++++++++++++--------------------------------------
 xmeffects.js |   3 +-
 4 files changed, 465 insertions(+), 398 deletions(-)
 create mode 100644 trackview.js

diff --git a/index.html b/index.html
index e54e71d..1370a34 100644
--- a/index.html
+++ b/index.html
@@ -2,6 +2,7 @@
   <title>js xm</title>
   <script src="http://a1k0n-pub.s3-website-us-west-1.amazonaws.com/xm/xmlist.js"></script>
   <script src="xmeffects.js"></script>
+  <script src="trackview.js"></script>
   <script src="xm.js"></script>
   <style>
 
diff --git a/trackview.js b/trackview.js
new file mode 100644
index 0000000..39c161f
--- /dev/null
+++ b/trackview.js
@@ -0,0 +1,334 @@
+(function (window, document) {
+if (!window.XMPlayer) {
+  window.XMPlayer = {};
+}
+var player = window.XMPlayer;
+
+if (!window.XMView) {
+  window.XMView = {};
+}
+var view = window.XMView;
+
+var _pattern_cellwidth = 16 + 4 + 8 + 4 + 8 + 16 + 4;
+var _scope_width = _pattern_cellwidth - 1;
+var _pattern_border = 20;
+
+view.init = init;
+view.pushEvent = pushEvent;
+view.pause = pause;
+view.resume = resume;
+view.stop = stop;
+view.scope_width = _scope_width;
+
+// Load font (ripped from FastTracker 2)
+var fontimg = new window.Image();
+fontimg.src = "ft2font.png";
+
+var _fontmap_notes = [8*5, 8*22, 8*28];
+var pat_canvas_patnum;
+
+var audio_events = [];
+var paused_events = [];
+var shown_row;
+
+// canvas to render patterns onto
+var pat_canvas = document.createElement('canvas');
+
+// pixel widths of each character in the proportional font
+var _fontwidths = [
+  4, 7, 3, 6, 6, 6, 6, 5, 4, 5, 5, 5, 5, 5, 7, 7,
+  5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 7,
+  4, 2, 5, 7, 7, 7, 7, 3, 4, 4, 6, 6, 3, 6, 2, 7,
+  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 2, 3, 6, 6, 6, 7,
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 7, 7, 7, 8, 8, 7,
+  7, 7, 7, 7, 8, 7, 7, 8, 8, 8, 7, 4, 7, 4, 4, 5,
+  3, 6, 6, 6, 6, 6, 4, 6, 6, 2, 4, 6, 2, 8, 6, 6,
+  6, 6, 4, 6, 4, 6, 7, 8, 7, 6, 6, 4, 2, 4, 4, 4];
+
+var _bigfontwidths = [
+   4, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 13, 13, 13, 15, 15, 15, 15, 15,
+   4,  5, 12, 16, 15, 15, 16,  5,  8,  8, 13, 10,  6, 10,  5, 12,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  5,  6, 12, 10, 12, 15,
+  14, 15, 15, 15, 15, 15, 15, 15, 15,  5, 13, 15, 14, 15, 15, 15,
+  15, 16, 15, 15, 15, 15, 15, 15, 15, 15, 16,  7, 12,  7, 13, 15,
+   5, 13, 13, 13, 13, 13, 11, 13, 13,  5,  9, 13,  5, 16, 13, 13,
+  13, 13, 12, 13, 11, 13, 13, 16, 15, 13, 15,  9,  2,  9, 15, 15];
+
+// draw FT2 proportional font text to a drawing context
+// returns width rendered
+function drawText(text, dx, dy, ctx) {
+  var dx0 = dx;
+  for (var i = 0; i < text.length; i++) {
+    var n = text.charCodeAt(i);
+    var sx = (n&63)*8;
+    var sy = (n>>6)*10 + 56;
+    var width = _fontwidths[n];
+    ctx.drawImage(fontimg, sx, sy, width, 10, dx, dy, width, 10);
+    dx += width + 1;
+  }
+  return dx - dx0;
+}
+
+function getTextSize(text, widthtable) {
+  var width = 0;
+  for (var i = 0; i < text.length; i++) {
+    var n = text.charCodeAt(i);
+    width += widthtable[n] + 1;
+  }
+  return width;
+}
+
+function drawBigText(text, dx, dy, ctx) {
+  var dx0 = dx;
+  for (var i = 0; i < text.length; i++) {
+    var n = text.charCodeAt(i);
+    var sx = (n&31)*16;
+    var sy = (n>>5)*20 + 96;
+    var width = _bigfontwidths[n];
+    ctx.drawImage(fontimg, sx, sy, width, 20, dx, dy, width, 20);
+    dx += width + 1;
+  }
+  return dx - dx0;
+}
+
+function RenderPattern(canv, pattern) {
+  // a pattern consists of NxM cells which look like
+  // N-O II VV EFF
+  var cellwidth = _pattern_cellwidth;
+  canv.width = pattern[0].length * cellwidth + _pattern_border;
+  canv.height = pattern.length * 8;
+  var ctx = canv.getContext('2d');
+  ctx.fillcolor='#000';
+  ctx.fillRect(0, 0, canv.width, canv.height);
+  for (var j = 0; j < pattern.length; j++) {
+    var row = pattern[j];
+    var dy = j * 8;
+    // render row number
+    ctx.drawImage(fontimg, 8*(j>>4), 0, 8, 8, 2, dy, 8, 8);
+    ctx.drawImage(fontimg, 8*(j&15), 0, 8, 8, 10, dy, 8, 8);
+
+    for (var i = 0; i < row.length; i++) {
+      var dx = i*cellwidth + 2 + _pattern_border;
+      var data = row[i];
+
+      // render note
+      var note = data[0];
+      if (note < 0) {
+        ctx.drawImage(fontimg, 0, 8*5, 16, 8, dx, dy, 16, 8);
+      } else {
+        var octave = (note/12)|0;
+        var note_fontrow = _fontmap_notes[(octave/3)|0];
+        note = (note % (12*3))|0;
+        ctx.drawImage(fontimg, 16+16*note, note_fontrow, 16, 8, dx, dy, 16, 8);
+      }
+      dx += 20;
+
+      // render instrument
+      var inst = data[1];
+      if (inst != -1) {  // no instrument = render nothing
+        if (inst > 15) {
+          ctx.drawImage(fontimg, 8*(inst>>4), 4*8, 4, 8, dx, dy, 4, 8);
+        }
+        ctx.drawImage(fontimg, 8*(inst&15), 4*8, 4, 8, dx+4, dy, 4, 8);
+      }
+      dx += 12;
+
+      // render volume
+      var vol = data[2];
+      if (vol < 0x10) {
+        ctx.drawImage(fontimg, 312, 0, 8, 8, dx, dy, 8, 8);
+      } else {
+        ctx.drawImage(fontimg, 8*(vol>>4) + 56*8, 4*8, 8, 8, dx, dy, 8, 8);
+        ctx.drawImage(fontimg, 8*(vol&15), 4*8, 4, 8, dx+4, dy, 4, 8);
+      }
+      dx += 8;
+
+      // render effect
+      var eff = data[3];
+      var effdata = data[4];
+      ctx.drawImage(fontimg, 8*eff + 16*8, 4*8, 8, 8, dx, dy, 8, 8);
+      dx += 8;
+      ctx.drawImage(fontimg, 8*(effdata>>4), 4*8, 4, 8, dx, dy, 4, 8);
+      ctx.drawImage(fontimg, 8*(effdata&15), 4*8, 4, 8, dx+4, dy, 4, 8);
+    }
+  }
+}
+
+function redrawScreen() {
+  if (audio_events.length === 0) return;
+
+  var e;
+  var t = player.audioctx.currentTime;
+  do {
+    e = audio_events.shift();
+  } while(e.t < t && audio_events.length > 0);
+  if (!e) return;
+  var VU = e.vu;
+  var scopes = e.scopes;
+  var ctx;
+
+  if (e.scopes) {
+    // update VU meters & oscilliscopes
+    var canvas = document.getElementById("vu");
+    ctx = canvas.getContext("2d");
+    ctx.fillStyle = '#000';
+    ctx.fillRect(0, 0, canvas.width, 64);
+    ctx.fillStyle = '#0f0';
+    ctx.strokeStyle = '#55acff';
+    for (var j = 0; j < player.xm.nchan; j++) {
+      var x = _pattern_border + j * _pattern_cellwidth;
+      // render channel number
+      drawText(''+j, x, 1, ctx);
+
+      // volume in dB as a green bar
+      var vu_y = -Math.log(VU[j])*10;
+      ctx.fillRect(x, vu_y, 2, 64-vu_y);
+
+      // oscilloscope
+      var scope = scopes[j];
+      if (scope) {
+        ctx.beginPath();
+        for (var k = 0; k < _scope_width; k++) {
+          ctx.lineTo(x + 1 + k, 32 - 16 * scope[k]);
+        }
+        ctx.stroke();
+      }
+    }
+  }
+
+  if (e.row != shown_row) {
+    if (e.pat != pat_canvas_patnum) {
+      var p = player.xm.patterns[e.pat];
+      if (p) {
+        RenderPattern(pat_canvas, player.xm.patterns[e.pat]);
+        pat_canvas_patnum = e.pat;
+      }
+    }
+    var gfx = document.getElementById("gfxpattern");
+    ctx = gfx.getContext('2d');
+    ctx.fillStyle = '#000';
+    ctx.fillRect(0, 0, gfx.width, gfx.height);
+    ctx.fillStyle = '#2a5684';
+    ctx.fillRect(0, gfx.height/2 - 4, gfx.width, 8);
+    ctx.globalCompositeOperation = 'lighten';
+    ctx.drawImage(pat_canvas, 0, gfx.height / 2 - 4 - 8*(e.row));
+    ctx.globalCompositeOperation = 'source-over';
+    shown_row = e.row;
+  }
+
+  if (audio_events.length > 0) {
+    var next_event = audio_events[0].t;
+    setTimeout(redrawScreen, 1000*(next_event - player.audioctx.currentTime));
+  }
+}
+
+function init() {
+  var title = document.getElementById("title");
+  // make title element fit text exactly, then render it
+  title.width = getTextSize(player.xm.songname, _bigfontwidths);
+  var ctx = title.getContext('2d');
+  drawBigText(player.xm.songname, 0, 1, ctx);
+
+  var instrlist = document.getElementById("instruments");
+  // clear instrument list if not already clear
+  while (instrlist.childNodes.length) {
+    instrlist.removeChild(instrlist.childNodes[0]);
+  }
+  var instrcols = ((player.xm.instruments.length + 7) / 8) | 0;
+  for (var i = 0; i < instrcols; i++) {
+    var canvas = document.createElement('canvas');
+    ctx = canvas.getContext('2d');
+    var instrcolumnwidth = 8*22;
+    canvas.width = instrcolumnwidth;
+    canvas.height = 8 * 10;
+    ctx.fillStyle = '#000';
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    var hasname = 0, hasdata = 0;
+    for (var j = 8*i; j < Math.min(8*i+8, player.xm.instruments.length); j++) {
+      var y = 10*(j - 8*i);
+      var n = (j+1).toString(16);
+      if (j < 15) n = '0' + n;
+      var data = player.xm.instruments[j].samples;
+      if (data) {
+        var len = data[0].len;
+        data = data[0].sampledata;
+        var scale = Math.ceil(len / instrcolumnwidth);
+        ctx.strokeStyle = '#55acff';
+        ctx.beginPath();
+        for (var k = 0; k < Math.min(len / scale, instrcolumnwidth - 20); k++) {
+          ctx.lineTo(k + 20, y + data[k*scale] * 4 + 4);
+        }
+        ctx.stroke();
+        hasdata++;
+      }
+      var name = player.xm.instruments[j].name;
+      ctx.globalCompositeOperation = 'lighten';
+      drawText(n, 1, y, ctx);
+      if (name !== '') {
+        drawText(player.xm.instruments[j].name, 20, y, ctx);
+        hasname++;
+      }
+      ctx.globalCompositeOperation = 'source-over';
+    }
+    if (hasname || hasdata) {
+      instrlist.appendChild(canvas);
+    }
+  }
+
+  document.getElementById('vu').width = _pattern_border +
+    _pattern_cellwidth * player.xm.nchan;
+  var gfxpattern = document.getElementById("gfxpattern");
+  gfxpattern.width = _pattern_cellwidth * player.xm.nchan + _pattern_border;
+
+  // generate a fake audio event to render the initial paused screen
+  var scopes = [];
+  for (i = 0; i < player.xm.nchan; i++) {
+    scopes.push(new Float32Array(_scope_width));
+  }
+
+  // reset display
+  shown_row = undefined;
+  pat_canvas_patnum = undefined;
+
+  audio_events.push({
+    t: 0, row: 0, pat: player.xm.songpats[0],
+    vu: new Float32Array(player.xm.nchan),
+    scopes: scopes
+  });
+  redrawScreen();
+}
+
+function pushEvent(e) {
+  audio_events.push(e);
+  if (audio_events.length == 1) {
+    requestAnimationFrame(redrawScreen);
+  }
+}
+
+function pause() {
+  // grab all the audio events
+  var t = player.audioctx.currentTime;
+  while (audio_events.length > 0) {
+    var e = audio_events.shift();
+    e.t -= t;
+    paused_events.push(e);
+  }
+}
+
+function resume() {
+  var t = player.audioctx.currentTime;
+  while (paused_events.length > 0) {
+    var e = paused_events.shift();
+    e.t += t;
+    audio_events.push(e);
+  }
+  requestAnimationFrame(redrawScreen);
+}
+
+function stop() {
+  audio_events = [];
+  paused_events = [];
+}
+
+})(window, document);
diff --git a/xm.js b/xm.js
index c55ac4f..d08280e 100644
--- a/xm.js
+++ b/xm.js
@@ -3,157 +3,32 @@ if (!window.XMPlayer) {
   window.XMPlayer = {};
 }
 var player = window.XMPlayer;
-player.allowDrop = allowDrop;
-player.handleDrop = handleDrop;
+
+if (!window.XMView) {
+  window.XMView = {};
+}
+var view = window.XMView;
+
 player.PeriodForNote = PeriodForNote;
 player.prettify_effect = prettify_effect;
+player.playXM = playXM;
+player.pauseXM = pauseXM;
+player.stopXM = stopXM;
+player.downloadXM = downloadXM;
 player.cur_songpos = -1;
 player.cur_pat = -1;
 player.cur_row = 64;
 player.cur_ticksamp = 0;
 player.cur_tick = 6;
-player.xm = {}; // contains all song data
-
-var audioctx;  // AudioContext
-
-// Load font (ripped from FastTracker 2)
-var fontimg = new Image();
-fontimg.src = "ft2font.png";
-
-// canvas to render patterns onto
-var pat_canvas = document.createElement('canvas');
+player.xm = {};  // contains all song data
 
 // for pretty-printing notes
-var _note_names = ["C-", "C#", "D-", "D#", "E-", "F-", "F#", "G-", "G#", "A-", "A#", "B-"];
+var _note_names = [
+  "C-", "C#", "D-", "D#", "E-", "F-",
+  "F#", "G-", "G#", "A-", "A#", "B-"];
 
 var f_smp = 44100;  // updated by play callback, default value here
 
-// pixel widths of each character in the proportional font
-var _fontwidths = [
-  4, 7, 3, 6, 6, 6, 6, 5, 4, 5, 5, 5, 5, 5, 7, 7,
-  5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 6, 7, 7, 7, 7, 7,
-  4, 2, 5, 7, 7, 7, 7, 3, 4, 4, 6, 6, 3, 6, 2, 7,
-  6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 2, 3, 6, 6, 6, 7,
-  7, 7, 7, 7, 7, 7, 7, 7, 7, 2, 7, 7, 7, 8, 8, 7,
-  7, 7, 7, 7, 8, 7, 7, 8, 8, 8, 7, 4, 7, 4, 4, 5,
-  3, 6, 6, 6, 6, 6, 4, 6, 6, 2, 4, 6, 2, 8, 6, 6,
-  6, 6, 4, 6, 4, 6, 7, 8, 7, 6, 6, 4, 2, 4, 4, 4];
-
-var _bigfontwidths = [
-   4, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-  15, 15, 15, 15, 15, 15, 15, 15, 13, 13, 13, 15, 15, 15, 15, 15,
-   4,  5, 12, 16, 15, 15, 16,  5,  8,  8, 13, 10,  6, 10,  5, 12,
-  15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  5,  6, 12, 10, 12, 15,
-  14, 15, 15, 15, 15, 15, 15, 15, 15,  5, 13, 15, 14, 15, 15, 15,
-  15, 16, 15, 15, 15, 15, 15, 15, 15, 15, 16,  7, 12,  7, 13, 15,
-   5, 13, 13, 13, 13, 13, 11, 13, 13,  5,  9, 13,  5, 16, 13, 13,
-  13, 13, 12, 13, 11, 13, 13, 16, 15, 13, 15,  9,  2,  9, 15, 15];
-
-// draw FT2 proportional font text to a drawing context
-// returns width rendered
-function DrawText(text, dx, dy, ctx) {
-  var dx0 = dx;
-  for (var i = 0; i < text.length; i++) {
-    var n = text.charCodeAt(i);
-    var sx = (n&63)*8;
-    var sy = (n>>6)*10 + 56;
-    var width = _fontwidths[n];
-    ctx.drawImage(fontimg, sx, sy, width, 10, dx, dy, width, 10);
-    dx += width + 1;
-  }
-  return dx - dx0;
-}
-
-function TextSize(text, widthtable) {
-  var width = 0;
-  for (var i = 0; i < text.length; i++) {
-    var n = text.charCodeAt(i);
-    width += widthtable[n] + 1;
-  }
-  return width;
-}
-
-function DrawBigText(text, dx, dy, ctx) {
-  var dx0 = dx;
-  for (var i = 0; i < text.length; i++) {
-    var n = text.charCodeAt(i);
-    var sx = (n&31)*16;
-    var sy = (n>>5)*20 + 96;
-    var width = _bigfontwidths[n];
-    ctx.drawImage(fontimg, sx, sy, width, 20, dx, dy, width, 20);
-    dx += width + 1;
-  }
-  return dx - dx0;
-}
-
-var _fontmap_notes = [8*5, 8*22, 8*28];
-var _pattern_cellwidth = 16 + 4 + 8 + 4 + 8 + 16 + 4;
-var _scope_width = _pattern_cellwidth - 1;
-var _pattern_border = 20;
-var pat_canvas_patnum;
-function RenderPattern(canv, pattern) {
-  // a pattern consists of NxM cells which look like
-  // N-O II VV EFF
-  var cellwidth = _pattern_cellwidth;
-  canv.width = pattern[0].length * cellwidth + _pattern_border;
-  canv.height = pattern.length * 8;
-  var ctx = canv.getContext('2d');
-  ctx.fillcolor='#000';
-  ctx.fillRect(0, 0, canv.width, canv.height);
-  for (var j = 0; j < pattern.length; j++) {
-    var row = pattern[j];
-    var dy = j * 8;
-    // render row number
-    ctx.drawImage(fontimg, 8*(j>>4), 0, 8, 8, 2, dy, 8, 8);
-    ctx.drawImage(fontimg, 8*(j&15), 0, 8, 8, 10, dy, 8, 8);
-
-    for (var i = 0; i < row.length; i++) {
-      var dx = i*cellwidth + 2 + _pattern_border;
-      var data = row[i];
-
-      // render note
-      var note = data[0];
-      if (note < 0) {
-        ctx.drawImage(fontimg, 0, 8*5, 16, 8, dx, dy, 16, 8);
-      } else {
-        var octave = (note/12)|0;
-        var note_fontrow = _fontmap_notes[(octave/3)|0];
-        note = (note % (12*3))|0;
-        ctx.drawImage(fontimg, 16+16*note, note_fontrow, 16, 8, dx, dy, 16, 8);
-      }
-      dx += 20;
-
-      // render instrument
-      var inst = data[1];
-      if (inst != -1) {  // no instrument = render nothing
-        if (inst > 15) {
-          ctx.drawImage(fontimg, 8*(inst>>4), 4*8, 4, 8, dx, dy, 4, 8);
-        }
-        ctx.drawImage(fontimg, 8*(inst&15), 4*8, 4, 8, dx+4, dy, 4, 8);
-      }
-      dx += 12;
-
-      // render volume
-      var vol = data[2];
-      if (vol < 0x10) {
-        ctx.drawImage(fontimg, 312, 0, 8, 8, dx, dy, 8, 8);
-      } else {
-        ctx.drawImage(fontimg, 8*(vol>>4) + 56*8, 4*8, 8, 8, dx, dy, 8, 8);
-        ctx.drawImage(fontimg, 8*(vol&15), 4*8, 4, 8, dx+4, dy, 4, 8);
-      }
-      dx += 8;
-
-      // render effect
-      var eff = data[3];
-      var effdata = data[4];
-      ctx.drawImage(fontimg, 8*eff + 16*8, 4*8, 8, 8, dx, dy, 8, 8);
-      dx += 8;
-      ctx.drawImage(fontimg, 8*(effdata>>4), 4*8, 4, 8, dx, dy, 4, 8);
-      ctx.drawImage(fontimg, 8*(effdata&15), 4*8, 4, 8, dx+4, dy, 4, 8);
-    }
-  }
-}
-
 function prettify_note(note) {
   if (note < 0) return "---";
   if (note == 96) return "^^^";
@@ -175,20 +50,20 @@ function prettify_effect(t, p) {
   if (t >= 10) t = String.fromCharCode(55 + t);
   if (p < 16) p = '0' + p.toString(16);
   else p = p.toString(16);
-  return t + p
+  return t + p;
 }
 
 function prettify_notedata(data) {
-  return (prettify_note(data[0]) + " " + prettify_number(data[1]) + " "
-    + prettify_volume(data[2]) + " "
-    + prettify_effect(data[3], data[4]));
+  return (prettify_note(data[0]) + " " + prettify_number(data[1]) + " " +
+      prettify_volume(data[2]) + " " +
+      prettify_effect(data[3], data[4]));
 }
 
 function getstring(dv, offset, len) {
   var str = [];
   for (var i = offset; i < offset+len; i++) {
     var c = dv.getUint8(i);
-    if (c == 0) break;
+    if (c === 0) break;
     str.push(String.fromCharCode(c));
   }
   return str.join('');
@@ -225,75 +100,6 @@ function PeriodForNote(ch, note) {
   return 1920 - (note + ch.samp.note)*16 - ch.samp.fine / 8.0;
 }
 
-var audio_events = [];
-var shown_row = undefined;
-function RedrawScreen() {
-  if (audio_events.length == 0) return;
-
-  var e;
-  var t = audioctx.currentTime;
-  do {
-    e = audio_events.shift();
-  } while(e.t < t && audio_events.length > 0);
-  if (e == undefined) return;
-  var VU = e.vu;
-  var scopes = e.scopes;
-
-  if (e.scopes != undefined) {
-    // update VU meters & oscilliscopes
-    var canvas = document.getElementById("vu");
-    var ctx = canvas.getContext("2d");
-    ctx.fillStyle = '#000';
-    ctx.fillRect(0, 0, canvas.width, 64);
-    ctx.fillStyle = '#0f0';
-    ctx.strokeStyle = '#55acff';
-    for (var j = 0; j < player.xm.nchan; j++) {
-      var x = _pattern_border + j * _pattern_cellwidth;
-      // render channel number
-      DrawText(''+j, x, 1, ctx);
-
-      // volume in dB as a green bar
-      var vu_y = -Math.log(VU[j])*10;
-      ctx.fillRect(x, vu_y, 2, 64-vu_y);
-
-      // oscilloscope
-      var scope = scopes[j];
-      if (scope != undefined) {
-        ctx.beginPath();
-        for (var k = 0; k < _scope_width; k++) {
-          ctx.lineTo(x + 1 + k, 32 - 16 * scope[k]);
-        }
-        ctx.stroke();
-      }
-    }
-  }
-
-  if (e.row != shown_row) {
-    var gfx = document.getElementById("gfxpattern");
-    if (e.pat != pat_canvas_patnum) {
-      var p = player.xm.patterns[e.pat];
-      if (p != undefined) {
-        RenderPattern(pat_canvas, player.xm.patterns[e.pat]);
-        pat_canvas_patnum = e.pat;
-      }
-    }
-    var ctx = gfx.getContext('2d');
-    ctx.fillStyle = '#000';
-    ctx.fillRect(0, 0, gfx.width, gfx.height);
-    ctx.fillStyle = '#2a5684';
-    ctx.fillRect(0, gfx.height/2 - 4, gfx.width, 8);
-    ctx.globalCompositeOperation = 'lighten';
-    ctx.drawImage(pat_canvas, 0, gfx.height / 2 - 4 - 8*(e.row));
-    ctx.globalCompositeOperation = 'source-over';
-    shown_row = e.row;
-  }
-
-  if (audio_events.length > 0) {
-    var next_event = audio_events[0].t;
-    setTimeout(RedrawScreen, 1000*(next_event - audioctx.currentTime));
-  }
-}
-
 function next_row() {
   if (player.cur_pat == -1 || player.cur_row >= player.xm.patterns[player.cur_pat].length) {
     player.cur_row = 0;
@@ -358,11 +164,11 @@ function next_row() {
       } else if (v >= 0x60 && v < 0x70) {  // volume slide down
         ch.voleffectfn = function(ch) {
           ch.vol = Math.max(0, ch.vol - ch.voleffectdata);
-        }
+        };
       } else if (v >= 0x70 && v < 0x80) {  // volume slide up
         ch.voleffectfn = function(ch) {
           ch.vol = Math.min(64, ch.vol + ch.voleffectdata);
-        }
+        };
       } else if (v >= 0x80 && v < 0x90) {  // fine volume slide down
         ch.vol = Math.max(0, ch.vol - (v & 0x0f));
       } else if (v >= 0x90 && v < 0xa0) {  // fine volume slide up
@@ -440,14 +246,14 @@ Envelope.prototype.Get = function(ticks) {
     y0 = env[i+1];
     if (ticks < env[i]) {
       var x0 = env[i-2];
-      var y0 = env[i-1];
+      y0 = env[i-1];
       var dx = env[i] - x0;
       var dy = env[i+1] - y0;
       return y0 + (ticks - x0) * dy / dx;
     }
   }
   return y0;
-}
+};
 
 function EnvelopeFollower(env) {
   this.env = env;
@@ -470,7 +276,7 @@ EnvelopeFollower.prototype.Tick = function(release) {
     }
   }
   return value;
-}
+};
 
 function next_tick() {
   player.cur_tick++;
@@ -555,7 +361,7 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
   var volR = volE * (128 + p) * ch.vol / 8192.0;
   if (volL < 0) volL = 0;
   if (volR < 0) volR = 0;
-  if (volR == 0 && volL == 0)
+  if (volR === 0 && volL === 0)
     return;
   if (isNaN(volR) || isNaN(volL)) {
     console.log("NaN volume!?", ch.number, volL, volR, volE, panE, ch.vol);
@@ -598,65 +404,66 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
     // this is the inner loop of the player
 
     // unrolled 8x
+    var s, y;
     for (; i + 7 < next_event; i+=8) {
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i] += vL * y;
       dataR[i] += vR * y;
       Vrms += (vL + vR) * y * y;
 
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i+1] += vL * y;
       dataR[i+1] += vR * y;
       Vrms += (vL + vR) * y * y;
 
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i+2] += vL * y;
       dataR[i+2] += vR * y;
       Vrms += (vL + vR) * y * y;
 
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i+3] += vL * y;
       dataR[i+3] += vR * y;
       Vrms += (vL + vR) * y * y;
 
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i+4] += vL * y;
       dataR[i+4] += vR * y;
       Vrms += (vL + vR) * y * y;
 
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i+5] += vL * y;
       dataR[i+5] += vR * y;
       Vrms += (vL + vR) * y * y;
 
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i+6] += vL * y;
       dataR[i+6] += vR * y;
       Vrms += (vL + vR) * y * y;
 
-      var s = samp[k|0];
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      s = samp[k|0];
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       k += dk;
       dataL[i+7] += vL * y;
@@ -668,13 +475,13 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
     }
 
     for (; i < next_event; i++) {
-      var s = samp[k|0];
+      s = samp[k|0];
       // we low-pass filter here since we are resampling some arbitrary
       // frequency to f_smp; this is an anti-aliasing filter and is
       // implemented as an IIR butterworth filter (usually we'd use an FIR
       // brick wall filter, but this is much simpler computationally and
       // sounds fine)
-      var y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
+      y = f0 * (s + fs0) + f1*fs1 + f2*fs2;
       fs2 = fs1; fs1 = y; fs0 = s;
       dataL[i] += vL * y;
       dataR[i] += vR * y;
@@ -692,19 +499,21 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
 }
 
 function audio_cb(e) {
-  f_smp = audioctx.sampleRate;
-  var time_sound_started = undefined;
+  f_smp = player.audioctx.sampleRate;
+  var time_sound_started;
   var buflen = e.outputBuffer.length;
   var dataL = e.outputBuffer.getChannelData(0);
   var dataR = e.outputBuffer.getChannelData(1);
+  var i, j, k;
 
-  for (var i = 0; i < buflen; i++) {
+  for (i = 0; i < buflen; i++) {
     dataL[i] = 0;
     dataR[i] = 0;
   }
 
   var offset = 0;
   var ticklen = 0|(f_smp * 2.5 / player.xm.bpm);
+  var _scope_width = view.scope_width || 0;
 
   while(buflen > 0) {
     if (player.cur_pat == -1 || player.cur_ticksamp >= ticklen) {
@@ -713,12 +522,12 @@ function audio_cb(e) {
     }
     var tickduration = Math.min(buflen, ticklen - player.cur_ticksamp);
     var VU = new Float32Array(player.xm.nchan);
-    var scopes = undefined;
-    for (var j = 0; j < player.xm.nchan; j++) {
+    var scopes;
+    for (j = 0; j < player.xm.nchan; j++) {
       var scope;
       if (tickduration >= 4*_scope_width) {
         scope = new Float32Array(_scope_width);
-        for (var k = 0; k < _scope_width; k++) {
+        for (k = 0; k < _scope_width; k++) {
           scope[k] = -dataL[offset+k*4] - dataR[offset+k*4];
         }
       }
@@ -728,14 +537,14 @@ function audio_cb(e) {
         tickduration;
 
       if (tickduration >= 4*_scope_width) {
-        for (var k = 0; k < _scope_width; k++) {
+        for (k = 0; k < _scope_width; k++) {
           scope[k] += dataL[offset+k*4] + dataR[offset+k*4];
         }
-        if (scopes == undefined) scopes = [];
+        if (scopes === undefined) scopes = [];
         scopes.push(scope);
       }
     }
-    audio_events.push({
+    view.pushEvent({
       t: e.playbackTime + (0.0 + offset) / f_smp,
       vu: VU,
       scopes: scopes,
@@ -743,9 +552,6 @@ function audio_cb(e) {
       pat: player.cur_pat,
       row: player.cur_row - 1
     });
-    if (audio_events.length == 1) {
-      requestAnimationFrame(RedrawScreen);
-    }
     offset += tickduration;
     player.cur_ticksamp += tickduration;
     buflen -= tickduration;
@@ -755,20 +561,21 @@ function audio_cb(e) {
 function ConvertSample(array, bits) {
   var len = array.length;
   var acc = 0;
-  if (bits == 0) {  // 8 bit sample
-    var samp = new Float32Array(len);
-    for (var k = 0; k < len; k++) {
+  var samp, b, k;
+  if (bits === 0) {  // 8 bit sample
+    samp = new Float32Array(len);
+    for (k = 0; k < len; k++) {
       acc += array[k];
-      var b = acc&255;
+      b = acc&255;
       if (b & 128) b = b-256;
       samp[k] = b / 128.0;
     }
     return samp;
   } else {
     len /= 2;
-    var samp = new Float32Array(len);
-    for (var k = 0; k < len; k++) {
-      var b = array[k*2] + (array[k*2 + 1] << 8);
+    samp = new Float32Array(len);
+    for (k = 0; k < len; k++) {
+      b = array[k*2] + (array[k*2 + 1] << 8);
       if (b & 32768) b = b-65536;
       acc = Math.max(-1, Math.min(1, acc + b / 32768.0));
       samp[k] = acc;
@@ -792,12 +599,13 @@ function UnrollSampleLoop(samp) {
     data[i] = samp.sampledata[i];
   }
   for (var j = 0; j < nloops; j++) {
+    var k;
     if ((j&1) && pingpong) {
-      for (var k = samp.looplen - 1; k >= 0; k--) {
+      for (k = samp.looplen - 1; k >= 0; k--) {
         data[i++] = samp.sampledata[samp.loop + k];
       }
     } else {
-      for (var k = 0; k < samp.looplen; k++) {
+      for (k = 0; k < samp.looplen; k++) {
         data[i++] = samp.sampledata[samp.loop + k];
       }
     }
@@ -824,7 +632,9 @@ function LoadXM(arrayBuf) {
   player.xm.bpm = dv.getUint16(0x4e, true);
   player.xm.channelinfo = [];
 
-  for (var i = 0; i < player.xm.nchan; i++) {
+  var i, j, k;
+
+  for (i = 0; i < player.xm.nchan; i++) {
     player.xm.channelinfo.push({
       number: i,
       filterstate: new Float32Array(3),
@@ -838,7 +648,7 @@ function LoadXM(arrayBuf) {
       retrig: 0,
       vibratodepth: 1,
       vibratospeed: 1,
-    })
+    });
   }
   console.log("header len " + hlen);
 
@@ -847,23 +657,23 @@ function LoadXM(arrayBuf) {
   console.log("flags=%d tempo %d bpm %d", player.xm.flags, player.xm.tempo, player.xm.bpm);
 
   player.xm.songpats = [];
-  for (var i = 0; i < songlen; i++) {
+  for (i = 0; i < songlen; i++) {
     player.xm.songpats.push(dv.getUint8(0x50 + i));
   }
   console.log("song patterns: ", player.xm.songpats);
 
   var idx = hlen;
   player.xm.patterns = [];
-  for (var i = 0; i < npat; i++) {
+  for (i = 0; i < npat; i++) {
     var pattern = [];
     var patheaderlen = dv.getUint32(idx, true);
     var patrows = dv.getUint16(idx + 5, true);
     var patsize = dv.getUint16(idx + 7, true);
     console.log("pattern %d: %d bytes, %d rows", i, patsize, patrows);
     idx += 9;
-    for (var j = 0; patsize > 0 && j < patrows; j++) {
+    for (j = 0; patsize > 0 && j < patrows; j++) {
       row = [];
-      for (var k = 0; k < player.xm.nchan; k++) {
+      for (k = 0; k < player.xm.nchan; k++) {
         var byte0 = dv.getUint8(idx); idx++;
         var note = -1, inst = -1, vol = -1, efftype = 0, effparam = 0;
         if (byte0 & 0x80) {
@@ -924,11 +734,11 @@ function LoadXM(arrayBuf) {
       var env_pan_loop_end = dv.getUint8(idx+232);
       var vol_fadeout = dv.getUint16(idx+239, true);
       var env_vol = [];
-      for (var j = 0; j < env_nvol*2; j++) {
+      for (j = 0; j < env_nvol*2; j++) {
         env_vol.push(dv.getUint16(idx+129+j*2, true));
       }
       var env_pan = [];
-      for (var j = 0; j < env_npan*2; j++) {
+      for (j = 0; j < env_npan*2; j++) {
         env_pan.push(dv.getUint16(idx+177+j*2, true));
       }
       // FIXME: ignoring keymaps for now and assuming 1 sample / instrument
@@ -939,7 +749,7 @@ function LoadXM(arrayBuf) {
       idx += hdrsiz;
       var totalsamples = 0;
       var samps = [];
-      for (var j = 0; j < nsamp; j++) {
+      for (j = 0; j < nsamp; j++) {
         var samplen = dv.getUint32(idx, true);
         var samploop = dv.getUint32(idx+4, true);
         var samplooplen = dv.getUint32(idx+8, true);
@@ -963,7 +773,6 @@ function LoadXM(arrayBuf) {
           'len': samplen, 'loop': samploop,
           'looplen': samplooplen, 'note': sampnote, 'fine': sampfinetune,
           'pan': samppan, 'type': samptype, 'vol': sampvol,
-          'fine': sampfinetune,
           'sampledata': ConvertSample(
               new Uint8Array(arrayBuf, sampleoffset, samplen), samptype & 16),
         };
@@ -1031,195 +840,116 @@ function LoadXM(arrayBuf) {
 
   console.log("loaded \"" + player.xm.songname + "\"");
 
-  var title = document.getElementById("title");
-  // make title element fit text exactly, then render it
-  title.width = TextSize(player.xm.songname, _bigfontwidths);
-  var ctx = title.getContext('2d');
-  DrawBigText(player.xm.songname, 0, 1, ctx);
-
-  var instrlist = document.getElementById("instruments");
-  // clear instrument list if not already clear
-  while (instrlist.childNodes.length) {
-    instrlist.removeChild(instrlist.childNodes[0]);
-  }
-  var instrcols = ((player.xm.instruments.length + 7) / 8) | 0;
-  for (var i = 0; i < instrcols; i++) {
-    var canvas = document.createElement('canvas');
-    var ctx = canvas.getContext('2d');
-    var instrcolumnwidth = 8*22;
-    canvas.width = instrcolumnwidth;
-    canvas.height = 8 * 10;
-    ctx.fillStyle = '#000';
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    var hasname = 0, hasdata = 0;
-    for (var j = 8*i; j < Math.min(8*i+8, player.xm.instruments.length); j++) {
-      var y = 10*(j - 8*i);
-      var n = (j+1).toString(16);
-      if (j < 15) n = '0' + n;
-      var data = player.xm.instruments[j].samples;
-      if (data) {
-        var len = data[0].len;
-        data = data[0].sampledata;
-        var scale = Math.ceil(len / instrcolumnwidth);
-        ctx.strokeStyle = '#55acff';
-        ctx.beginPath();
-        for (var k = 0; k < Math.min(len / scale, instrcolumnwidth - 20); k++) {
-          ctx.lineTo(k + 20, y + data[k*scale] * 4 + 4);
-        }
-        ctx.stroke();
-        hasdata++;
-      }
-      var name = player.xm.instruments[j].name;
-      ctx.globalCompositeOperation = 'lighten';
-      DrawText(n, 1, y, ctx);
-      if (name != '') {
-        DrawText(player.xm.instruments[j].name, 20, y, ctx);
-        hasname++;
-      }
-      ctx.globalCompositeOperation = 'source-over';
-    }
-    if (hasname || hasdata) {
-      instrlist.appendChild(canvas);
-    }
-  }
-
   return player.xm;
 }
 
 var jsNode, gainNode;
-function InitAudio() {
-  if (audioctx == undefined) {
+function initAudio() {
+  if (!player.audioctx) {
     var audioContext = window.AudioContext || window.webkitAudioContext;
-    audioctx = new audioContext();
-    gainNode = audioctx.createGain();
+    player.audioctx = new audioContext();
+    gainNode = player.audioctx.createGain();
     gainNode.gain.value = 0.1;  // master volume
   }
-  if (audioctx.createScriptProcessor == undefined) {
-    jsNode = audioctx.createJavaScriptNode(16384, 0, 2);
+  if (player.audioctx.createScriptProcessor === undefined) {
+    jsNode = player.audioctx.createJavaScriptNode(16384, 0, 2);
   } else {
-    jsNode = audioctx.createScriptProcessor(16384, 0, 2);
+    jsNode = player.audioctx.createScriptProcessor(16384, 0, 2);
   }
   jsNode.onaudioprocess = audio_cb;
-  gainNode.connect(audioctx.destination);
+  gainNode.connect(player.audioctx.destination);
 }
 
 var playing = false;
-var paused_events = [];
-function PlayXM() {
+function playXM() {
   if (!playing) {
     // put paused events back into action, if any
-    var t = audioctx.currentTime;
-    while (paused_events.length > 0) {
-      var e = paused_events.shift();
-      e.t += t;
-      audio_events.push(e);
-    }
+    view.resume();
     // start playing
     jsNode.connect(gainNode);
 
     // hack to get iOS to play anything
-    var temp_osc = audioctx.createOscillator();
-    temp_osc.connect(audioctx.destination);
+    /*
+     * this seems to cause other player issues... disabling for now
+    var temp_osc = player.audioctx.createOscillator();
+    temp_osc.connect(player.audioctx.destination);
     if (temp_osc.noteOn) temp_osc.start = temp_osc.noteOn;
     temp_osc.frequency.value = 1;
     temp_osc.start(0);
     setTimeout(10, function() {
       temp_osc.disconnect();
     });
-
-    requestAnimationFrame(RedrawScreen);
+    */
   }
   playing = true;
 }
 
-function PauseXM() {
+function pauseXM() {
   if (playing) {
     jsNode.disconnect(gainNode);
-    // grab all the audio events
-    var t = audioctx.currentTime;
-    while (audio_events.length > 0) {
-      var e = audio_events.shift();
-      e.t -= t;
-      paused_events.push(e);
-    }
+    view.pause();
   }
   playing = false;
 }
 
-function StopXM() {
+function stopXM() {
   if (playing) {
     jsNode.disconnect(gainNode);
     playing = false;
-    audio_events = [];
-    paused_events = [];
   }
-  player.cur_songpos = -1, player.cur_pat = -1, player.cur_row = 64, player.cur_ticksamp = 0;
-  InitAudio();
+  player.cur_pat = -1;
+  player.cur_row = 64;
+  player.cur_songpos = -1;
+  player.cur_ticksamp = 0;
+  initAudio();
 }
 
-function LoadXMAndInit(xmdata) {
+function loadXMAndInit(xmdata) {
   player.xm = LoadXM(xmdata);
   if (!player.xm) return;
 
-  document.getElementById('vu').width = _pattern_border + _pattern_cellwidth * player.xm.nchan;
-  var gfxpattern = document.getElementById("gfxpattern");
-  gfxpattern.width = _pattern_cellwidth * player.xm.nchan + _pattern_border;
-  var playbutton = document.getElementById('playpause');
+  view.init();
+
+  var playbutton = document.getElementById("playpause");
   playbutton.innerHTML='Play';
   playbutton.onclick = function() {
     if (playing) {
-      PauseXM();
+      pauseXM();
       playbutton.innerHTML='Play';
     } else {
-      PlayXM();
+      playXM();
       playbutton.innerHTML='Pause';
     }
-  }
+  };
   playbutton.disabled = false;
-  // generate a fake audio event to render the initial paused screen
-  var scopes = [];
-  for (var i = 0; i < player.xm.nchan; i++) {
-    scopes.push(new Float32Array(_scope_width));
-  }
-
-  // reset display
-  shown_row = undefined;
-  pat_canvas_patnum = undefined;
-
-  audio_events.push({
-    t: 0, row: 0, pat: player.xm.songpats[0],
-    vu: new Float32Array(player.xm.nchan),
-    scopes: scopes
-  });
-  RedrawScreen();
 
   return player.xm;
 }
 
-function DownloadXM(uri) {
+function downloadXM(uri) {
   var xmReq = new XMLHttpRequest();
   xmReq.open("GET", uri, true);
   xmReq.responseType = "arraybuffer";
   xmReq.onload = function (xmEvent) {
     var arrayBuffer = xmReq.response;
     if (arrayBuffer) {
-      player.xm = LoadXMAndInit(arrayBuffer);
+      player.xm = loadXMAndInit(arrayBuffer);
     } else {
       console.log("unable to load", uri);
     }
-  }
+  };
   xmReq.send(null);
 }
 
-function allowDrop(ev) {
+player.allowDrop = function(ev) {
   ev.stopPropagation();
   ev.preventDefault();
   var elem = document.getElementById("playercontainer");
   elem.className = (ev.type == "dragover" ? "draghover" : "playercontainer");
   return false;
-}
+};
 
-function handleDrop(e) {
+player.handleDrop = function(e) {
   console.log(e);
   e.preventDefault();
   var elem = document.getElementById("playercontainer");
@@ -1228,13 +958,14 @@ function handleDrop(e) {
   if (files.length < 1) return false;
   var reader = new FileReader();
   reader.onload = function(e) {
-    LoadXMAndInit(e.target.result);
-  }
+    stopXM();
+    loadXMAndInit(e.target.result);
+  };
   reader.readAsArrayBuffer(files[0]);
   return false;
-}
+};
 
-function InitFilelist() {
+function initFilelist() {
   var el = document.getElementById('filelist');
   xmuris.forEach(function(entry) {
     var a = document.createElement('a');
@@ -1242,9 +973,9 @@ function InitFilelist() {
     a.href = '#'+entry[1];
     a.onclick = function() {
       el.style.display = "none";
-      StopXM();
-      DownloadXM(baseuri + entry[1]);
-    }
+      stopXM();
+      downloadXM(baseuri + entry[1]);
+    };
     el.appendChild(a);
     el.appendChild(document.createElement('br'));
   });
@@ -1255,20 +986,20 @@ function InitFilelist() {
     } else {
       el.style.display = "none";
     }
-  }
+  };
 }
 
 window.onload = function() {
-  InitAudio();
-  InitFilelist();
+  initAudio();
+  initFilelist();
 
   var uri = location.hash.substr(1);
-  if (uri == "") {
+  if (uri === "") {
     uri = "kamel.xm";
   }
   if (!uri.startsWith("http")) {
     uri = baseuri + uri;
   }
-  DownloadXM(uri);
-}
-})(window || {}, document);
+  downloadXM(uri);
+};
+})(window, document);
diff --git a/xmeffects.js b/xmeffects.js
index bc9a9aa..b6139f6 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -155,7 +155,7 @@ function eff_t0_e(ch, data) {  // extended effects!
     case 0x0c:  // note cut handled in eff_t1_e
       break;
     default:
-      console.log("unimplemented extended effect E", ch.effect.toString(16));
+      console.log("unimplemented extended effect E", ch.effectdata.toString(16));
       break;
   }
 }
@@ -293,4 +293,5 @@ player.effects_t1 = [  // effect functions on tick 1+
   eff_unimplemented,  // y
   eff_unimplemented   // z
 ];
+
 })(window || {});

From 8c37c8d96bd3ca4f2ec65ab4118bfc9089bf06dd Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 11 Nov 2015 21:09:58 -0800
Subject: [PATCH 22/65] Separate html "shell" javascript; player now standalone

Closes #3.

The code which defines what the buttons do and downloads songs and so
forth are now completely separated from the player, which has the
following API:

 - `XMPlayer.initAudio` -> starts up audio context; it's available as
   `XMPlayer.audioctx`
 - `XMPlayer.loadXM(ArrayBuffer)` -> returns `true` if loaded, otherwise
   barfs randomly
 - `XMPlayer.playXM()` -> starts playing
 - `XMPlayer.pauseXM()` -> obvious
 - `XMPlayer.stopXM()` -> obvious; call this before loading a new one

Loading trackview.js is now optional; without it, the player won't do
any visualizations. Or, you can override the following to get callbacks:

 - `XMView.pushEvent(e)` -> push an audio event onto the queue. Called
   once per tick (about 50Hz, controlled by song). `e` contains fields:
   - `t` - audio timestamp
   - `vu` - Float32Array of RMS power (volume) for each channel
   - `scopes` - [Float32Array] of oscilloscope data, one array per
     channel; `XMView.scope_width` contains # of samples to produce here
   - `songpos` - position in the song (# patterns played)
   - `pat` - pattern number currently playing
   - `row` - row within pattern
 - `XMView.pause()` - pause visualization
 - `XMView.stop()` - stop/reset visualization
---
 index.html   |   1 +
 shell.js     | 111 +++++++++++++++++++++++++++++++++
 trackview.js |  26 ++++----
 xm.js        | 170 +++++++++++----------------------------------------
 4 files changed, 164 insertions(+), 144 deletions(-)
 create mode 100644 shell.js

diff --git a/index.html b/index.html
index 1370a34..0dfe25d 100644
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@
   <script src="xmeffects.js"></script>
   <script src="trackview.js"></script>
   <script src="xm.js"></script>
+  <script src="shell.js"></script>
   <style>
 
 .centered {
diff --git a/shell.js b/shell.js
new file mode 100644
index 0000000..240be41
--- /dev/null
+++ b/shell.js
@@ -0,0 +1,111 @@
+(function (window, document) {
+if (!window.XMPlayer) {
+  window.XMPlayer = {};
+}
+var XMPlayer = window.XMPlayer;
+if (!window.XMView) {
+  window.XMView = {};
+}
+var XMView = window.XMView;
+
+function loadXMAndInit(xmdata) {
+  if (!XMPlayer.loadXM(xmdata)) {
+    return;
+  }
+
+  XMView.init();
+
+  var playbutton = document.getElementById("playpause");
+  playbutton.innerHTML='Play';
+  playbutton.onclick = function() {
+    if (XMPlayer.playing) {
+      XMPlayer.pauseXM();
+      playbutton.innerHTML='Play';
+    } else {
+      XMPlayer.playXM();
+      playbutton.innerHTML='Pause';
+    }
+  };
+  playbutton.disabled = false;
+
+  return XMPlayer.xm;
+}
+
+function downloadXM(uri) {
+  var xmReq = new XMLHttpRequest();
+  xmReq.open("GET", uri, true);
+  xmReq.responseType = "arraybuffer";
+  xmReq.onload = function (xmEvent) {
+    var arrayBuffer = xmReq.response;
+    if (arrayBuffer) {
+      loadXMAndInit(arrayBuffer);
+    } else {
+      console.log("unable to load", uri);
+    }
+  };
+  xmReq.send(null);
+}
+
+XMPlayer.allowDrop = function(ev) {
+  ev.stopPropagation();
+  ev.preventDefault();
+  var elem = document.getElementById("playercontainer");
+  elem.className = (ev.type == "dragover" ? "draghover" : "playercontainer");
+  return false;
+};
+
+XMPlayer.handleDrop = function(e) {
+  console.log(e);
+  e.preventDefault();
+  var elem = document.getElementById("playercontainer");
+  elem.className = "playercontainer";
+  var files = e.target.files || e.dataTransfer.files;
+  if (files.length < 1) return false;
+  var reader = new FileReader();
+  reader.onload = function(e) {
+    XMPlayer.stopXM();
+    loadXMAndInit(e.target.result);
+  };
+  reader.readAsArrayBuffer(files[0]);
+  return false;
+};
+
+function initFilelist() {
+  var el = document.getElementById('filelist');
+  xmuris.forEach(function(entry) {
+    var a = document.createElement('a');
+    a.text = entry[0];
+    a.href = '#'+entry[1];
+    a.onclick = function() {
+      el.style.display = "none";
+      XMPlayer.stopXM();
+      downloadXM(baseuri + entry[1]);
+    };
+    el.appendChild(a);
+    el.appendChild(document.createElement('br'));
+  });
+  var loadbutton = document.getElementById('loadbutton');
+  loadbutton.onclick = function() {
+    if (el.style.display == "none") {
+      el.style.display = "block";
+    } else {
+      el.style.display = "none";
+    }
+  };
+}
+
+window.onload = function() {
+  XMPlayer.initAudio();
+  initFilelist();
+
+  var uri = location.hash.substr(1);
+  if (uri === "") {
+    uri = "kamel.xm";
+  }
+  if (!uri.startsWith("http")) {
+    uri = baseuri + uri;
+  }
+  downloadXM(uri);
+};
+
+})(window, document);
diff --git a/trackview.js b/trackview.js
index 39c161f..202a917 100644
--- a/trackview.js
+++ b/trackview.js
@@ -27,8 +27,8 @@ fontimg.src = "ft2font.png";
 var _fontmap_notes = [8*5, 8*22, 8*28];
 var pat_canvas_patnum;
 
-var audio_events = [];
-var paused_events = [];
+var audio_events;
+var paused_events;
 var shown_row;
 
 // canvas to render patterns onto
@@ -156,19 +156,22 @@ function RenderPattern(canv, pattern) {
 }
 
 function redrawScreen() {
-  if (audio_events.length === 0) return;
-
   var e;
   var t = player.audioctx.currentTime;
-  do {
+  while (audio_events.length > 0 && audio_events[0].t < t) {
     e = audio_events.shift();
-  } while(e.t < t && audio_events.length > 0);
-  if (!e) return;
+  }
+  if (!e) {
+    if (player.playing) {
+      window.requestAnimationFrame(redrawScreen);
+    }
+    return;
+  }
   var VU = e.vu;
   var scopes = e.scopes;
   var ctx;
 
-  if (e.scopes) {
+  if (e.scopes !== undefined) {
     // update VU meters & oscilliscopes
     var canvas = document.getElementById("vu");
     ctx = canvas.getContext("2d");
@@ -217,9 +220,8 @@ function redrawScreen() {
     shown_row = e.row;
   }
 
-  if (audio_events.length > 0) {
-    var next_event = audio_events[0].t;
-    setTimeout(redrawScreen, 1000*(next_event - player.audioctx.currentTime));
+  if (player.playing) {
+    window.requestAnimationFrame(redrawScreen);
   }
 }
 
@@ -291,6 +293,8 @@ function init() {
   shown_row = undefined;
   pat_canvas_patnum = undefined;
 
+  audio_events = [];
+  paused_events = [];
   audio_events.push({
     t: 0, row: 0, pat: player.xm.songpats[0],
     vu: new Float32Array(player.xm.nchan),
diff --git a/xm.js b/xm.js
index d08280e..787b788 100644
--- a/xm.js
+++ b/xm.js
@@ -1,4 +1,4 @@
-(function (window, document) {
+(function (window) {
 if (!window.XMPlayer) {
   window.XMPlayer = {};
 }
@@ -7,14 +7,15 @@ var player = window.XMPlayer;
 if (!window.XMView) {
   window.XMView = {};
 }
-var view = window.XMView;
+var XMView = window.XMView;
 
 player.PeriodForNote = PeriodForNote;
 player.prettify_effect = prettify_effect;
+player.initAudio = initAudio;
+player.loadXM = loadXM;
 player.playXM = playXM;
 player.pauseXM = pauseXM;
 player.stopXM = stopXM;
-player.downloadXM = downloadXM;
 player.cur_songpos = -1;
 player.cur_pat = -1;
 player.cur_row = 64;
@@ -513,7 +514,7 @@ function audio_cb(e) {
 
   var offset = 0;
   var ticklen = 0|(f_smp * 2.5 / player.xm.bpm);
-  var _scope_width = view.scope_width || 0;
+  var scopewidth = XMView.scope_width;
 
   while(buflen > 0) {
     if (player.cur_pat == -1 || player.cur_ticksamp >= ticklen) {
@@ -522,12 +523,12 @@ function audio_cb(e) {
     }
     var tickduration = Math.min(buflen, ticklen - player.cur_ticksamp);
     var VU = new Float32Array(player.xm.nchan);
-    var scopes;
+    var scopes = undefined;
     for (j = 0; j < player.xm.nchan; j++) {
       var scope;
-      if (tickduration >= 4*_scope_width) {
-        scope = new Float32Array(_scope_width);
-        for (k = 0; k < _scope_width; k++) {
+      if (tickduration >= 4*scopewidth) {
+        scope = new Float32Array(scopewidth);
+        for (k = 0; k < scopewidth; k++) {
           scope[k] = -dataL[offset+k*4] - dataR[offset+k*4];
         }
       }
@@ -536,25 +537,27 @@ function audio_cb(e) {
           player.xm.channelinfo[j], offset, offset + tickduration, dataL, dataR) /
         tickduration;
 
-      if (tickduration >= 4*_scope_width) {
-        for (k = 0; k < _scope_width; k++) {
+      if (tickduration >= 4*scopewidth) {
+        for (k = 0; k < scopewidth; k++) {
           scope[k] += dataL[offset+k*4] + dataR[offset+k*4];
         }
         if (scopes === undefined) scopes = [];
         scopes.push(scope);
       }
     }
-    view.pushEvent({
-      t: e.playbackTime + (0.0 + offset) / f_smp,
-      vu: VU,
-      scopes: scopes,
-      songpos: player.cur_songpos,
-      pat: player.cur_pat,
-      row: player.cur_row - 1
-    });
-    offset += tickduration;
-    player.cur_ticksamp += tickduration;
-    buflen -= tickduration;
+    if (XMView.pushEvent) {
+      XMView.pushEvent({
+        t: e.playbackTime + (0.0 + offset) / f_smp,
+        vu: VU,
+        scopes: scopes,
+        songpos: player.cur_songpos,
+        pat: player.cur_pat,
+        row: player.cur_row - 1
+      });
+      offset += tickduration;
+      player.cur_ticksamp += tickduration;
+      buflen -= tickduration;
+    }
   }
 }
 
@@ -616,7 +619,7 @@ function UnrollSampleLoop(samp) {
   samp.type = 1;
 }
 
-function LoadXM(arrayBuf) {
+function loadXM(arrayBuf) {
   var dv = new DataView(arrayBuf);
   player.xm = {};
 
@@ -839,8 +842,7 @@ function LoadXM(arrayBuf) {
   }
 
   console.log("loaded \"" + player.xm.songname + "\"");
-
-  return player.xm;
+  return true;
 }
 
 var jsNode, gainNode;
@@ -860,11 +862,11 @@ function initAudio() {
   gainNode.connect(player.audioctx.destination);
 }
 
-var playing = false;
+player.playing = false;
 function playXM() {
-  if (!playing) {
+  if (!player.playing) {
     // put paused events back into action, if any
-    view.resume();
+    if (XMView.resume) XMView.resume();
     // start playing
     jsNode.connect(gainNode);
 
@@ -881,125 +883,27 @@ function playXM() {
     });
     */
   }
-  playing = true;
+  player.playing = true;
 }
 
 function pauseXM() {
-  if (playing) {
+  if (player.playing) {
     jsNode.disconnect(gainNode);
-    view.pause();
+    if (XMView.pause) XMView.pause();
   }
-  playing = false;
+  player.playing = false;
 }
 
 function stopXM() {
-  if (playing) {
+  if (player.playing) {
     jsNode.disconnect(gainNode);
-    playing = false;
+    player.playing = false;
   }
   player.cur_pat = -1;
   player.cur_row = 64;
   player.cur_songpos = -1;
   player.cur_ticksamp = 0;
+  if (XMView.stop) XMView.stop();
   initAudio();
 }
-
-function loadXMAndInit(xmdata) {
-  player.xm = LoadXM(xmdata);
-  if (!player.xm) return;
-
-  view.init();
-
-  var playbutton = document.getElementById("playpause");
-  playbutton.innerHTML='Play';
-  playbutton.onclick = function() {
-    if (playing) {
-      pauseXM();
-      playbutton.innerHTML='Play';
-    } else {
-      playXM();
-      playbutton.innerHTML='Pause';
-    }
-  };
-  playbutton.disabled = false;
-
-  return player.xm;
-}
-
-function downloadXM(uri) {
-  var xmReq = new XMLHttpRequest();
-  xmReq.open("GET", uri, true);
-  xmReq.responseType = "arraybuffer";
-  xmReq.onload = function (xmEvent) {
-    var arrayBuffer = xmReq.response;
-    if (arrayBuffer) {
-      player.xm = loadXMAndInit(arrayBuffer);
-    } else {
-      console.log("unable to load", uri);
-    }
-  };
-  xmReq.send(null);
-}
-
-player.allowDrop = function(ev) {
-  ev.stopPropagation();
-  ev.preventDefault();
-  var elem = document.getElementById("playercontainer");
-  elem.className = (ev.type == "dragover" ? "draghover" : "playercontainer");
-  return false;
-};
-
-player.handleDrop = function(e) {
-  console.log(e);
-  e.preventDefault();
-  var elem = document.getElementById("playercontainer");
-  elem.className = "playercontainer";
-  var files = e.target.files || e.dataTransfer.files;
-  if (files.length < 1) return false;
-  var reader = new FileReader();
-  reader.onload = function(e) {
-    stopXM();
-    loadXMAndInit(e.target.result);
-  };
-  reader.readAsArrayBuffer(files[0]);
-  return false;
-};
-
-function initFilelist() {
-  var el = document.getElementById('filelist');
-  xmuris.forEach(function(entry) {
-    var a = document.createElement('a');
-    a.text = entry[0];
-    a.href = '#'+entry[1];
-    a.onclick = function() {
-      el.style.display = "none";
-      stopXM();
-      downloadXM(baseuri + entry[1]);
-    };
-    el.appendChild(a);
-    el.appendChild(document.createElement('br'));
-  });
-  var loadbutton = document.getElementById('loadbutton');
-  loadbutton.onclick = function() {
-    if (el.style.display == "none") {
-      el.style.display = "block";
-    } else {
-      el.style.display = "none";
-    }
-  };
-}
-
-window.onload = function() {
-  initAudio();
-  initFilelist();
-
-  var uri = location.hash.substr(1);
-  if (uri === "") {
-    uri = "kamel.xm";
-  }
-  if (!uri.startsWith("http")) {
-    uri = baseuri + uri;
-  }
-  downloadXM(uri);
-};
-})(window, document);
+})(window);

From 7ca90f9b98447b194e82581aede8459ad8641a91 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 11 Nov 2015 22:27:53 -0800
Subject: [PATCH 23/65] really basic test runner

npm test now does... something somewhat useful.

now to write a bunch of tests.
---
 .gitignore   |  1 +
 package.json | 12 ++++++--
 test/all.js  | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 xm.js        | 37 ++++++++++++++----------
 xmeffects.js |  4 +--
 5 files changed, 116 insertions(+), 20 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 test/all.js

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/package.json b/package.json
index 96863a7..05c84f0 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,19 @@
 {
   "name": "jsxm",
-  "version": "1",
+  "version": "1.0.0",
+  "description": "WebAudio FastTracker 2 .XM module player",
+  "keywords": "fasttracker xm webaudio",
+  "uri": "http://www.a1k0n.net/code/jsxm/",
+  "repository": "a1k0n/jsxm",
+  "author": "Andy Sloane <andy@a1k0n.net> (http://www.a1k0n.net/)",
+
   "main": "index.html",
   "window": {
     "frame": true,
     "toolbar": false,
     "position": "center",
     "resizable": true
-  }
+  },
+  "scripts": { "test": "node test/all.js" },
+  "devDependencies": { "test": ">=0.0.5" }
 }
diff --git a/test/all.js b/test/all.js
new file mode 100644
index 0000000..c12d2a8
--- /dev/null
+++ b/test/all.js
@@ -0,0 +1,82 @@
+window = {};
+
+require('../xm.js', window);
+require('../xmeffects.js', window);
+
+var XMPlayer = window.XMPlayer;
+
+// set up basic blank single-channel, single-pattern XM
+function ResetXMData() {
+  var xm = {};
+  window.XMPlayer.xm = xm;
+  xm.channelinfo = [];
+  xm.songname = "test song";
+  xm.song_looppos = 0;
+  xm.nchan = 1;
+  xm.flags = 1;
+  xm.tempo = 3;
+  xm.bpm = 125;
+  xm.channelinfo.push({
+    number: 0,
+    filterstate: new Float32Array(3),
+    vol: 0,
+    pan: 128,
+    period: 1920 - 48*16,
+    vL: 0, vR: 0,
+    vLprev: 0, vRprev: 0,
+    mute: 0,
+    volE: 0, panE: 0,
+    retrig: 0,
+    vibratodepth: 1,
+    vibratospeed: 1,
+  });
+  xm.songpats = [0];
+  // 1 channel, 2 row blank pattern
+  xm.patterns = [
+    [[[-1, -1, -1, 0, 0]]],
+    [[[-1, -1, -1, 0, 0]]]];
+  xm.instruments = [];
+  xm.instruments.push({
+    'name': "test instrument",
+    'number': 0,
+    'samples': [
+      { 'len': 256, 'loop': 0,
+        'looplen': 256, 'note': 0, 'fine': 0,
+        'pan': 128, 'type': 0, 'vol': 64,
+        'sampledata': new Float32Array(256)
+      }
+    ],
+    'samplemap': new Uint8Array(96),
+    'env_vol': new XMPlayer.Envelope([0, 64, 1, 0], 2, 0, 0, 0),
+    'env_pan': new XMPlayer.Envelope([0, 32], 0, 0, 0, 0)
+  });
+  // reset song position
+  XMPlayer.cur_songpos = -1;
+  XMPlayer.cur_pat = -1;
+  XMPlayer.cur_tick = xm.tempo;
+  return xm;
+}
+
+// using assert passed to the test function that just logs failures 
+exports['test XM startup'] = function(assert) {
+  ResetXMData();
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
+  assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
+  assert.equal(XMPlayer.cur_tick, 0, 'advance to tick 0');
+  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+};
+
+exports['test note on'] = function(assert) {
+  var xm = ResetXMData();
+  // [row][column][channel]
+  xm.patterns[0][0][0] = [48, 1, 0x10 + 33, 0, 0];  // C-4  1 40 000
+  XMPlayer.nextTick();
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.note, 48, 'set note');
+  assert.equal(ch.period, 1152, 'channel period');
+  assert.equal(ch.vol, 33, 'channel volume');
+  assert.equal(ch.samp, xm.instruments[0].samples[0], 'set sample');
+};
+
+if (module == require.main) require('test').run(exports);
diff --git a/xm.js b/xm.js
index 787b788..576e68f 100644
--- a/xm.js
+++ b/xm.js
@@ -9,7 +9,7 @@ if (!window.XMView) {
 }
 var XMView = window.XMView;
 
-player.PeriodForNote = PeriodForNote;
+player.periodForNote = periodForNote;
 player.prettify_effect = prettify_effect;
 player.initAudio = initAudio;
 player.loadXM = loadXM;
@@ -23,6 +23,10 @@ player.cur_ticksamp = 0;
 player.cur_tick = 6;
 player.xm = {};  // contains all song data
 
+// exposed for testing
+player.nextTick = nextTick;
+player.Envelope = Envelope;
+
 // for pretty-printing notes
 var _note_names = [
   "C-", "C#", "D-", "D#", "E-", "F-",
@@ -30,6 +34,10 @@ var _note_names = [
 
 var f_smp = 44100;  // updated by play callback, default value here
 
+// per-sample exponential moving average for volume changes (to prevent pops
+// and clicks); evaluated every 8 samples
+var popfilter_alpha = 0.9837;
+
 function prettify_note(note) {
   if (note < 0) return "---";
   if (note == 96) return "^^^";
@@ -72,7 +80,7 @@ function getstring(dv, offset, len) {
 
 // Return 2-pole Butterworth lowpass filter coefficients for
 // center frequncy f_c (relative to sampling frequency)
-function FilterCoeffs(f_c) {
+function filterCoeffs(f_c) {
   if (f_c > 0.5) {  // we can't lowpass above the nyquist frequency...
     f_c = 0.5;
   }
@@ -84,24 +92,21 @@ function FilterCoeffs(f_c) {
   return [gain, 2*c, -c*c - s*s];
 }
 
-popfilter = FilterCoeffs(200.0 / 44100.0);
-popfilter_alpha = 0.9837;
-
-function UpdateChannelPeriod(ch, period) {
+function updateChannelPeriod(ch, period) {
   var freq = 8363 * Math.pow(2, (1152.0 - period) / 192.0);
   if (isNaN(freq)) {
     console.log("invalid period!", period);
     return;
   }
   ch.doff = freq / f_smp;
-  ch.filter = FilterCoeffs(ch.doff / 2);
+  ch.filter = filterCoeffs(ch.doff / 2);
 }
 
-function PeriodForNote(ch, note) {
+function periodForNote(ch, note) {
   return 1920 - (note + ch.samp.note)*16 - ch.samp.fine / 8.0;
 }
 
-function next_row() {
+function nextRow() {
   if (player.cur_pat == -1 || player.cur_row >= player.xm.patterns[player.cur_pat].length) {
     player.cur_row = 0;
     player.cur_songpos++;
@@ -196,7 +201,7 @@ function next_row() {
     // special handling for portamentos: don't trigger the note
     if (ch.effect == 3 || ch.effect == 5) {
       if (r[i][0] != -1) {
-        ch.periodtarget = PeriodForNote(ch, ch.note);
+        ch.periodtarget = periodForNote(ch, ch.note);
       }
       triggernote = false;
       if (inst && inst.samplemap) {
@@ -224,7 +229,7 @@ function next_row() {
       ch.env_vol = new EnvelopeFollower(inst.env_vol);
       ch.env_pan = new EnvelopeFollower(inst.env_pan);
       if (ch.note != undefined) {
-        ch.period = PeriodForNote(ch, ch.note);
+        ch.period = periodForNote(ch, ch.note);
       }
     }
   }
@@ -279,11 +284,11 @@ EnvelopeFollower.prototype.Tick = function(release) {
   return value;
 };
 
-function next_tick() {
+function nextTick() {
   player.cur_tick++;
   if (player.cur_tick >= player.xm.tempo) {
     player.cur_tick = 0;
-    next_row();
+    nextRow();
   }
   for (var j = 0; j < player.xm.nchan; j++) {
     var ch = player.xm.channelinfo[j];
@@ -305,7 +310,7 @@ function next_tick() {
     }
     ch.volE = ch.env_vol.Tick(ch.release);
     ch.panE = ch.env_pan.Tick(ch.release);
-    UpdateChannelPeriod(ch, ch.period + ch.periodoffset);
+    updateChannelPeriod(ch, ch.period + ch.periodoffset);
   }
 }
 
@@ -386,7 +391,7 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
   var i = start;
   var failsafe = 100;
   while (i < end) {
-    if (failsafe-- == 0) {
+    if (failsafe-- === 0) {
       console.log("failsafe in mixing loop! channel", ch.number, k, sample_end,
           loopstart, looplen, dk);
       break;
@@ -518,7 +523,7 @@ function audio_cb(e) {
 
   while(buflen > 0) {
     if (player.cur_pat == -1 || player.cur_ticksamp >= ticklen) {
-      next_tick(f_smp);
+      nextTick(f_smp);
       player.cur_ticksamp -= ticklen;
     }
     var tickduration = Math.min(buflen, ticklen - player.cur_ticksamp);
diff --git a/xmeffects.js b/xmeffects.js
index b6139f6..ef429fa 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -8,7 +8,7 @@ function eff_t1_0(ch) {  // arpeggio
   if (ch.effectdata != 0 && ch.inst != undefined) {
     var arpeggio = [0, ch.effectdata>>4, ch.effectdata&15];
     var note = ch.note + arpeggio[player.cur_tick % 3];
-    ch.period = player.PeriodForNote(ch, note);
+    ch.period = player.periodForNote(ch, note);
   }
 }
 
@@ -294,4 +294,4 @@ player.effects_t1 = [  // effect functions on tick 1+
   eff_unimplemented   // z
 ];
 
-})(window || {});
+})(window);

From 9bf35716f35ce24cacf506379e6368c337799ecc Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 11 Nov 2015 22:32:56 -0800
Subject: [PATCH 24/65] add travis testing

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..796d98f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - "0.12"

From ce5fd027a38776aacb44e4cc02011fddddbe5349 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Wed, 11 Nov 2015 22:49:40 -0800
Subject: [PATCH 25/65] add build status and API docs to README

---
 README.md | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d5bf329..a43c6ad 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,40 @@
 # xm.js
 
+[![Build Status](https://travis-ci.org/a1k0n/jsxm.svg?branch=master)](https://travis-ci.org/a1k0n/jsxm)
+
 FastTracker 2 .XM player, written for fun.
 
 [Demo](http://www.a1k0n.net/code/jsxm/)
 
-By default it plays "my dirty old kamel" by Alexander Bulér aka
-[Zalza](http://zalza.bandcamp.com/). I love this tune, and wrote this code just
-to play it. It can also load some other tunes hosted on my website with a file
-picker, and it should play just about any .XM file now if checked out and run
-locally.
+There is an XM player and a visualizer which are separate components. The
+player API looks like this:
 
-It is fairly feature-complete, but is missing a bunch of effects.
+ - `XMPlayer.initAudio` -> starts up audio context; it's available as
+   `XMPlayer.audioctx`
+ - `XMPlayer.loadXM(ArrayBuffer)` -> returns `true` if loaded, otherwise
+   barfs randomly
+ - `XMPlayer.playXM()` -> starts playing
+ - `XMPlayer.pauseXM()` -> obvious
+ - `XMPlayer.stopXM()` -> obvious; call this before loading a new one
+
+Loading trackview.js is optional; without it, the player won't do any
+visualizations. Or, you can override the following to get callbacks:
+
+ - `XMView.pushEvent(e)` -> push an audio event onto the queue. Called
+   once per tick (about 50Hz, controlled by song). `e` contains fields:
+   - `t` - audio timestamp
+   - `vu` - Float32Array of RMS power (volume) for each channel
+   - `scopes` - [Float32Array] of oscilloscope data, one array per
+     channel; `XMView.scope_width` contains # of samples to produce here
+   - `songpos` - position in the song (# patterns played)
+   - `pat` - pattern number currently playing
+   - `row` - row within pattern
+ - `XMView.pause()` - pause visualization
+ - `XMView.stop()` - stop/reset visualization
+
+The code which defines what the buttons do and downloads songs and so
+forth is in `shell.js`.
+
+The player is fairly feature-complete, but is missing a bunch of effects.
 
 MIT license.

From 6a5fe5e024e91d5897742217a2767a6b1b9a2af0 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Thu, 12 Nov 2015 08:56:33 -0800
Subject: [PATCH 26/65] Remove XM suffix from XMPlayer calls

---
 README.md | 10 +++++-----
 shell.js  | 12 ++++++------
 xm.js     | 22 +++++++++++-----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index a43c6ad..b6609c9 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,13 @@ FastTracker 2 .XM player, written for fun.
 There is an XM player and a visualizer which are separate components. The
 player API looks like this:
 
- - `XMPlayer.initAudio` -> starts up audio context; it's available as
+ - `XMPlayer.init` -> starts up audio context; it's available as
    `XMPlayer.audioctx`
- - `XMPlayer.loadXM(ArrayBuffer)` -> returns `true` if loaded, otherwise
+ - `XMPlayer.load(ArrayBuffer)` -> returns `true` if loaded, otherwise
    barfs randomly
- - `XMPlayer.playXM()` -> starts playing
- - `XMPlayer.pauseXM()` -> obvious
- - `XMPlayer.stopXM()` -> obvious; call this before loading a new one
+ - `XMPlayer.play()` -> starts playing
+ - `XMPlayer.pause()` -> obvious
+ - `XMPlayer.stop()` -> obvious; call this before loading a new one
 
 Loading trackview.js is optional; without it, the player won't do any
 visualizations. Or, you can override the following to get callbacks:
diff --git a/shell.js b/shell.js
index 240be41..8a96b70 100644
--- a/shell.js
+++ b/shell.js
@@ -9,7 +9,7 @@ if (!window.XMView) {
 var XMView = window.XMView;
 
 function loadXMAndInit(xmdata) {
-  if (!XMPlayer.loadXM(xmdata)) {
+  if (!XMPlayer.load(xmdata)) {
     return;
   }
 
@@ -19,10 +19,10 @@ function loadXMAndInit(xmdata) {
   playbutton.innerHTML='Play';
   playbutton.onclick = function() {
     if (XMPlayer.playing) {
-      XMPlayer.pauseXM();
+      XMPlayer.pause();
       playbutton.innerHTML='Play';
     } else {
-      XMPlayer.playXM();
+      XMPlayer.play();
       playbutton.innerHTML='Pause';
     }
   };
@@ -63,7 +63,7 @@ XMPlayer.handleDrop = function(e) {
   if (files.length < 1) return false;
   var reader = new FileReader();
   reader.onload = function(e) {
-    XMPlayer.stopXM();
+    XMPlayer.stop();
     loadXMAndInit(e.target.result);
   };
   reader.readAsArrayBuffer(files[0]);
@@ -78,7 +78,7 @@ function initFilelist() {
     a.href = '#'+entry[1];
     a.onclick = function() {
       el.style.display = "none";
-      XMPlayer.stopXM();
+      XMPlayer.stop();
       downloadXM(baseuri + entry[1]);
     };
     el.appendChild(a);
@@ -95,7 +95,7 @@ function initFilelist() {
 }
 
 window.onload = function() {
-  XMPlayer.initAudio();
+  XMPlayer.init();
   initFilelist();
 
   var uri = location.hash.substr(1);
diff --git a/xm.js b/xm.js
index 576e68f..7f0b989 100644
--- a/xm.js
+++ b/xm.js
@@ -11,11 +11,11 @@ var XMView = window.XMView;
 
 player.periodForNote = periodForNote;
 player.prettify_effect = prettify_effect;
-player.initAudio = initAudio;
-player.loadXM = loadXM;
-player.playXM = playXM;
-player.pauseXM = pauseXM;
-player.stopXM = stopXM;
+player.init = init;
+player.load = load;
+player.play = play;
+player.pause = pause;
+player.stop = stop;
 player.cur_songpos = -1;
 player.cur_pat = -1;
 player.cur_row = 64;
@@ -624,7 +624,7 @@ function UnrollSampleLoop(samp) {
   samp.type = 1;
 }
 
-function loadXM(arrayBuf) {
+function load(arrayBuf) {
   var dv = new DataView(arrayBuf);
   player.xm = {};
 
@@ -851,7 +851,7 @@ function loadXM(arrayBuf) {
 }
 
 var jsNode, gainNode;
-function initAudio() {
+function init() {
   if (!player.audioctx) {
     var audioContext = window.AudioContext || window.webkitAudioContext;
     player.audioctx = new audioContext();
@@ -868,7 +868,7 @@ function initAudio() {
 }
 
 player.playing = false;
-function playXM() {
+function play() {
   if (!player.playing) {
     // put paused events back into action, if any
     if (XMView.resume) XMView.resume();
@@ -891,7 +891,7 @@ function playXM() {
   player.playing = true;
 }
 
-function pauseXM() {
+function pause() {
   if (player.playing) {
     jsNode.disconnect(gainNode);
     if (XMView.pause) XMView.pause();
@@ -899,7 +899,7 @@ function pauseXM() {
   player.playing = false;
 }
 
-function stopXM() {
+function stop() {
   if (player.playing) {
     jsNode.disconnect(gainNode);
     player.playing = false;
@@ -909,6 +909,6 @@ function stopXM() {
   player.cur_songpos = -1;
   player.cur_ticksamp = 0;
   if (XMView.stop) XMView.stop();
-  initAudio();
+  init();
 }
 })(window);

From be463856db108f52db638ab3241458425d03c4fc Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Thu, 12 Nov 2015 10:57:02 -0800
Subject: [PATCH 27/65] Add round 1 of tests

---
 test/all.js        | 81 +++++++------------------------------------
 test/effects.js    | 85 ++++++++++++++++++++++++++++++++++++++++++++++
 test/instrument.js | 55 ++++++++++++++++++++++++++++++
 test/testdata.js   | 56 ++++++++++++++++++++++++++++++
 xm.js              |  1 +
 5 files changed, 210 insertions(+), 68 deletions(-)
 create mode 100644 test/effects.js
 create mode 100644 test/instrument.js
 create mode 100644 test/testdata.js

diff --git a/test/all.js b/test/all.js
index c12d2a8..a21d2bd 100644
--- a/test/all.js
+++ b/test/all.js
@@ -1,65 +1,19 @@
 window = {};
 
-require('../xm.js', window);
-require('../xmeffects.js', window);
-
+require('../xm.js');
+require('../xmeffects.js');
 var XMPlayer = window.XMPlayer;
 
-// set up basic blank single-channel, single-pattern XM
-function ResetXMData() {
-  var xm = {};
-  window.XMPlayer.xm = xm;
-  xm.channelinfo = [];
-  xm.songname = "test song";
-  xm.song_looppos = 0;
-  xm.nchan = 1;
-  xm.flags = 1;
-  xm.tempo = 3;
-  xm.bpm = 125;
-  xm.channelinfo.push({
-    number: 0,
-    filterstate: new Float32Array(3),
-    vol: 0,
-    pan: 128,
-    period: 1920 - 48*16,
-    vL: 0, vR: 0,
-    vLprev: 0, vRprev: 0,
-    mute: 0,
-    volE: 0, panE: 0,
-    retrig: 0,
-    vibratodepth: 1,
-    vibratospeed: 1,
-  });
-  xm.songpats = [0];
-  // 1 channel, 2 row blank pattern
-  xm.patterns = [
-    [[[-1, -1, -1, 0, 0]]],
-    [[[-1, -1, -1, 0, 0]]]];
-  xm.instruments = [];
-  xm.instruments.push({
-    'name': "test instrument",
-    'number': 0,
-    'samples': [
-      { 'len': 256, 'loop': 0,
-        'looplen': 256, 'note': 0, 'fine': 0,
-        'pan': 128, 'type': 0, 'vol': 64,
-        'sampledata': new Float32Array(256)
-      }
-    ],
-    'samplemap': new Uint8Array(96),
-    'env_vol': new XMPlayer.Envelope([0, 64, 1, 0], 2, 0, 0, 0),
-    'env_pan': new XMPlayer.Envelope([0, 32], 0, 0, 0, 0)
-  });
-  // reset song position
-  XMPlayer.cur_songpos = -1;
-  XMPlayer.cur_pat = -1;
-  XMPlayer.cur_tick = xm.tempo;
-  return xm;
-}
+tests = {};
+testdata = require('./testdata.js');
 
+// test TODO:
+//  - audio output sample positions after ticks
+//  - unit test for envelopes
+//
 // using assert passed to the test function that just logs failures 
-exports['test XM startup'] = function(assert) {
-  ResetXMData();
+tests['test XM startup'] = function(assert) {
+  testdata.resetXMData();
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
   assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
@@ -67,16 +21,7 @@ exports['test XM startup'] = function(assert) {
   assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
 };
 
-exports['test note on'] = function(assert) {
-  var xm = ResetXMData();
-  // [row][column][channel]
-  xm.patterns[0][0][0] = [48, 1, 0x10 + 33, 0, 0];  // C-4  1 40 000
-  XMPlayer.nextTick();
-  var ch = xm.channelinfo[0];
-  assert.equal(ch.note, 48, 'set note');
-  assert.equal(ch.period, 1152, 'channel period');
-  assert.equal(ch.vol, 33, 'channel volume');
-  assert.equal(ch.samp, xm.instruments[0].samples[0], 'set sample');
-};
+require('./instrument.js');
+require('./effects.js');
 
-if (module == require.main) require('test').run(exports);
+if (module == require.main) require('test').run(tests);
diff --git a/test/effects.js b/test/effects.js
new file mode 100644
index 0000000..2993de8
--- /dev/null
+++ b/test/effects.js
@@ -0,0 +1,85 @@
+var XMPlayer = window.XMPlayer;
+
+// TODO:
+//  - portamento 3xx
+//  - vibrato 4xy
+//  - volume slide Axy
+//  - porta+vol 5xy
+//  - etc etc
+
+tests['test 0xy arpeggio'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.patterns[0][0][0] = [48, 1, -1, 0, 0x4f];  // C-4  1 -- 04f
+  XMPlayer.xm.tempo = 4;
+  XMPlayer.nextTick();
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.note, 48, 'note 0');
+  assert.equal(ch.period, 1152, 'row 0 tick 0 period 0');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 16*4, 'row 0 tick 1 period 4');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 16*15, 'row 0 tick 2 period f');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 16*0, 'row 0 tick 3 period 0');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 16*0, 'row 1 tick 0 period 0');
+};
+
+tests['test 1xx slide up'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.patterns[0][0][0] = [48,  1, -1, 1, 0x01];  // C-4  1 -- 101
+  xm.patterns[0][1][0] = [-1, -1, -1, 1, 0x00];  // --- -- -- 100
+  XMPlayer.xm.tempo = 3;
+  XMPlayer.nextTick();
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.period, 1152, 'row 0 tick 0 period 0');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 1, 'row 0 tick 1 period -1');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 2, 'row 0 tick 2 period -2');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 2, 'row 1 tick 0 period -2');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 3, 'row 1 tick 1 period -3');
+};
+
+tests['test 2xx slide down'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.patterns[0][0][0] = [48,  1, -1, 2, 0x01];  // C-4  1 -- 201
+  xm.patterns[0][1][0] = [-1, -1, -1, 2, 0x00];  // --- -- -- 200
+  XMPlayer.xm.tempo = 3;
+  XMPlayer.nextTick();
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.period, 1152, 'row 0 tick 0 period 0');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 + 1, 'row 0 tick 1 period -1');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 + 2, 'row 0 tick 2 period -2');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 + 2, 'row 1 tick 0 period -2');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 + 3, 'row 1 tick 1 period -3');
+};
+
+tests['test 3xx portamento'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.patterns[0][0][0] = [48,  1, -1, 0, 0x00];  // C-4  1 -- 000
+  xm.patterns[0][1][0] = [49,  1, -1, 3, 0x09];  // C#4  1 -- 309
+  XMPlayer.xm.tempo = 3;
+  XMPlayer.nextTick();  // row 0 tick 0
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.period, 1152, 'row 0 tick 0 period 0');
+  XMPlayer.nextTick();  // row 0 tick 1
+  XMPlayer.nextTick();  // row 0 tick 2
+  XMPlayer.nextTick();  // row 1 tick 0
+  assert.equal(ch.period, 1152, 'row 1 tick 0 period 0');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 9, 'row 1 tick 1 period -9');
+  XMPlayer.nextTick();
+  assert.equal(ch.period, 1152 - 16, 'row 1 tick 2 period -16');
+};
+
diff --git a/test/instrument.js b/test/instrument.js
new file mode 100644
index 0000000..929ee7e
--- /dev/null
+++ b/test/instrument.js
@@ -0,0 +1,55 @@
+var XMPlayer = window.XMPlayer;
+
+// TODO:
+//  - test volume envelope (sustain, release)
+//  - test panning envelope
+
+tests['test note on'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.patterns[0][0][0] = [48, 1, 0x10 + 0x33, 0, 0];  // C-4  1 33 000
+  XMPlayer.nextRow();
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.note, 48, 'set note');
+  assert.equal(ch.period, 1152, 'channel period');
+  assert.equal(ch.vol, 0x33, 'channel volume');
+  assert.equal(ch.samp, xm.instruments[0].samples[0], 'set sample');
+  assert.equal(ch.off, 0, 'trigger offset');
+};
+
+tests['test instrument trigger'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.patterns[0][0][0] = [48, 1, 0x10 + 0x33, 0, 0];  // C-4  1 33 000
+  xm.patterns[0][1][0] = [-1, 1, -1, 0, 0];  // ---  1 -- 000
+  var ch = xm.channelinfo[0];
+  XMPlayer.nextRow();
+  ch.pan = 1;  // forcibly override panning
+  ch.off = 100;  // and sample offset
+  assert.equal(XMPlayer.cur_row, 1, 'row 1');
+  XMPlayer.nextRow();
+  assert.equal(XMPlayer.cur_row, 2, 'row 2');
+  assert.equal(ch.note, 48, 'note same after inst trigger');
+  assert.equal(ch.period, 1152, 'period same after inst trigger');
+  assert.equal(ch.vol, 64, 'vol reset after inst trigger');
+  assert.equal(ch.pan, 128, 'pan reset after inst trigger');
+  assert.equal(ch.samp, xm.instruments[0].samples[0], 'set sample');
+  assert.equal(ch.off, 0, 'set offset=0');
+};
+
+tests['test note trigger'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.patterns[0][0][0] = [48, 1, 0x10 + 0x33, 0, 0];  // C-4  1 33 000
+  xm.patterns[0][1][0] = [49, -1, -1, 0, 0];  // C#4 -- -- 000
+  var ch = xm.channelinfo[0];
+  XMPlayer.nextRow();
+  ch.pan = 1;  // forcibly override panning
+  ch.off = 100;  // and sample offset
+  XMPlayer.nextRow();
+  assert.equal(ch.note, 49, 'note updated after inst trigger');
+  assert.equal(ch.period, 1136, 'period updated after note trigger');
+  assert.equal(ch.vol, 0x33, 'vol not reset after note trigger');
+  assert.equal(ch.pan, 1, 'pan not reset after note trigger');
+  assert.equal(ch.off, 0, 'set offset=0');
+};
diff --git a/test/testdata.js b/test/testdata.js
new file mode 100644
index 0000000..ed04dec
--- /dev/null
+++ b/test/testdata.js
@@ -0,0 +1,56 @@
+var XMPlayer = window.XMPlayer;
+
+// set up basic blank single-channel, single-pattern XM
+exports.resetXMData = function() {
+  var xm = {};
+  window.XMPlayer.xm = xm;
+  xm.channelinfo = [];
+  xm.songname = "test song";
+  xm.song_looppos = 0;
+  xm.nchan = 1;
+  xm.flags = 1;
+  xm.tempo = 3;
+  xm.bpm = 125;
+  xm.channelinfo.push({
+    number: 0,
+    filterstate: new Float32Array(3),
+    vol: 0,
+    pan: 128,
+    period: 1920 - 48*16,
+    vL: 0, vR: 0,
+    vLprev: 0, vRprev: 0,
+    mute: 0,
+    volE: 0, panE: 0,
+    retrig: 0,
+    vibratodepth: 1,
+    vibratospeed: 1,
+  });
+  xm.songpats = [0];
+  // 1 channel, 2 row blank pattern
+  xm.patterns = [
+    [
+      [[-1, -1, -1, 0, 0]],
+      [[-1, -1, -1, 0, 0]]
+    ]
+  ];
+  xm.instruments = [];
+  xm.instruments.push({
+    'name': "test instrument",
+    'number': 0,
+    'samples': [
+      { 'len': 256, 'loop': 0,
+        'looplen': 256, 'note': 0, 'fine': 0,
+        'pan': 128, 'type': 0, 'vol': 64,
+        'sampledata': new Float32Array(256)
+      }
+    ],
+    'samplemap': new Uint8Array(96),
+    'env_vol': new XMPlayer.Envelope([0, 64, 1, 0], 2, 0, 0, 0),
+    'env_pan': new XMPlayer.Envelope([0, 32], 0, 0, 0, 0)
+  });
+  // reset song position
+  XMPlayer.cur_songpos = -1;
+  XMPlayer.cur_pat = -1;
+  XMPlayer.cur_tick = xm.tempo;
+  return xm;
+};
diff --git a/xm.js b/xm.js
index 7f0b989..5b28d9f 100644
--- a/xm.js
+++ b/xm.js
@@ -25,6 +25,7 @@ player.xm = {};  // contains all song data
 
 // exposed for testing
 player.nextTick = nextTick;
+player.nextRow = nextRow;
 player.Envelope = Envelope;
 
 // for pretty-printing notes

From 570aa33a20cc8a9b24dbee80a93c253b01b013e8 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Fri, 13 Nov 2015 22:06:50 -0800
Subject: [PATCH 28/65] added test for vibrato... and fixed vibrato

naturally when i actually tested it, it turned out to be subtly broken

also reorg'd the tests a bit, sorry @hillerstorm.
---
 test/all.js        |  9 +++--
 test/effects.js    | 85 +++++++++++++++++++++++++++++++++++++++++-----
 test/instrument.js |  6 ++--
 test/testdata.js   |  1 +
 xm.js              | 26 ++++++++------
 xmeffects.js       |  5 +--
 6 files changed, 104 insertions(+), 28 deletions(-)

diff --git a/test/all.js b/test/all.js
index a21d2bd..c0a6053 100644
--- a/test/all.js
+++ b/test/all.js
@@ -4,7 +4,6 @@ require('../xm.js');
 require('../xmeffects.js');
 var XMPlayer = window.XMPlayer;
 
-tests = {};
 testdata = require('./testdata.js');
 
 // test TODO:
@@ -12,7 +11,7 @@ testdata = require('./testdata.js');
 //  - unit test for envelopes
 //
 // using assert passed to the test function that just logs failures 
-tests['test XM startup'] = function(assert) {
+exports['test XM startup'] = function(assert) {
   testdata.resetXMData();
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
@@ -21,7 +20,7 @@ tests['test XM startup'] = function(assert) {
   assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
 };
 
-require('./instrument.js');
-require('./effects.js');
+exports['test instruments'] = require('./instrument.js');
+exports['test effects'] = require('./effects.js');
 
-if (module == require.main) require('test').run(tests);
+if (module == require.main) require('test').run(exports);
diff --git a/test/effects.js b/test/effects.js
index 2993de8..247fec6 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -7,7 +7,7 @@ var XMPlayer = window.XMPlayer;
 //  - porta+vol 5xy
 //  - etc etc
 
-tests['test 0xy arpeggio'] = function(assert) {
+exports['test 0xy arpeggio'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
   xm.patterns[0][0][0] = [48, 1, -1, 0, 0x4f];  // C-4  1 -- 04f
@@ -26,7 +26,7 @@ tests['test 0xy arpeggio'] = function(assert) {
   assert.equal(ch.period, 1152 - 16*0, 'row 1 tick 0 period 0');
 };
 
-tests['test 1xx slide up'] = function(assert) {
+exports['test 1xx slide up'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
   xm.patterns[0][0][0] = [48,  1, -1, 1, 0x01];  // C-4  1 -- 101
@@ -45,7 +45,7 @@ tests['test 1xx slide up'] = function(assert) {
   assert.equal(ch.period, 1152 - 3, 'row 1 tick 1 period -3');
 };
 
-tests['test 2xx slide down'] = function(assert) {
+exports['test 2xx slide down'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
   xm.patterns[0][0][0] = [48,  1, -1, 2, 0x01];  // C-4  1 -- 201
@@ -55,16 +55,16 @@ tests['test 2xx slide down'] = function(assert) {
   var ch = xm.channelinfo[0];
   assert.equal(ch.period, 1152, 'row 0 tick 0 period 0');
   XMPlayer.nextTick();
-  assert.equal(ch.period, 1152 + 1, 'row 0 tick 1 period -1');
+  assert.equal(ch.period, 1152 + 1, 'row 0 tick 1 period +1');
   XMPlayer.nextTick();
-  assert.equal(ch.period, 1152 + 2, 'row 0 tick 2 period -2');
+  assert.equal(ch.period, 1152 + 2, 'row 0 tick 2 period +2');
   XMPlayer.nextTick();
-  assert.equal(ch.period, 1152 + 2, 'row 1 tick 0 period -2');
+  assert.equal(ch.period, 1152 + 2, 'row 1 tick 0 period +2');
   XMPlayer.nextTick();
-  assert.equal(ch.period, 1152 + 3, 'row 1 tick 1 period -3');
+  assert.equal(ch.period, 1152 + 3, 'row 1 tick 1 period +3');
 };
 
-tests['test 3xx portamento'] = function(assert) {
+exports['test 3xx portamento'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
   xm.patterns[0][0][0] = [48,  1, -1, 0, 0x00];  // C-4  1 -- 000
@@ -83,3 +83,72 @@ tests['test 3xx portamento'] = function(assert) {
   assert.equal(ch.period, 1152 - 16, 'row 1 tick 2 period -16');
 };
 
+exports['test 4xy vibrato'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // vibrato 4xy: speed x, depth y
+  // full cycle is 64/speed
+  // [pat][row][channel]
+  xm.patterns[0] = [
+    [[48,  1, -1, 4, 0x81]],  // C-4  1 -- 481
+    [[-1, -1, -1, 4, 0x02]],  // --- -- -- 402
+    [[-1, -1, -1, 4, 0x10]],  // --- -- -- 410
+    [[-1, -1, -1, 4, 0x00]],  // --- -- -- 400
+    [[-1, -1, -1, 0, 0x00]],  // --- -- -- 000 - no vibrato
+    [[-1, -1, -1, 4, 0x00]],  // --- -- -- 400 - resume vibrato @ pos 0
+  ];
+  // I should really be testing ch.doff directly
+  XMPlayer.xm.tempo = 3;
+  var ch = xm.channelinfo[0];
+  XMPlayer.nextTick();  // row 0 tick 0
+  var p0 = ch.doff;
+  assert.equal(ch.periodoffset, 0, 'row 0 tick 0 periodoffset=0');
+  XMPlayer.nextTick();  // row 0 tick 1
+  // compute logical period p from actual play frequency
+  var p = 16*12 * Math.log(p0 / ch.doff) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.707", 'row 0 tick 1 period +0.707');
+  XMPlayer.nextTick();  // row 0 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "1.000", 'row 0 tick 2 period +1.000');
+  XMPlayer.nextTick();  // row 1 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "1.414", 'row 1 tick 0 period +1.414');
+  XMPlayer.nextTick();  // row 1 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.000", 'row 1 tick 1 period +0');
+  XMPlayer.nextTick();  // row 1 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.414", 'row 1 tick 2 period -1.414');
+  XMPlayer.nextTick();  // row 2 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-2.000", 'row 2 tick 0 period -2.000');
+  XMPlayer.nextTick();  // row 2 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.990", 'row 2 tick 1 period -1.990');
+  XMPlayer.nextTick();  // row 2 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.962", 'row 2 tick 2 period -1.962');
+  XMPlayer.nextTick();  // row 3 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.914", 'row 3 tick 0 period -1.914');
+  XMPlayer.nextTick();  // row 3 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.848", 'row 3 tick 1 period -1.848');
+  XMPlayer.nextTick();  // row 3 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.764", 'row 3 tick 2 period -1.764');
+  XMPlayer.nextTick();  // row 4 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.000", 'row 4 tick 0 period 0 - no vibrato');
+  XMPlayer.nextTick();  // row 4 tick 1
+  XMPlayer.nextTick();  // row 4 tick 2
+  // I actually don't know whether vibrato is supposed to reset when the effect
+  // goes away or whether it should resume. Resuming is simpler to implement so
+  // that's what I'm assuming here...
+  XMPlayer.nextTick();  // row 5 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.663", 'row 5 tick 0 period -1.663 - vibrato resume');
+  XMPlayer.nextTick();  // row 5 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.546", 'row 5 tick 1 period -1.546');
+};
+
diff --git a/test/instrument.js b/test/instrument.js
index 929ee7e..a7d399b 100644
--- a/test/instrument.js
+++ b/test/instrument.js
@@ -4,7 +4,7 @@ var XMPlayer = window.XMPlayer;
 //  - test volume envelope (sustain, release)
 //  - test panning envelope
 
-tests['test note on'] = function(assert) {
+exports['test note on'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
   xm.patterns[0][0][0] = [48, 1, 0x10 + 0x33, 0, 0];  // C-4  1 33 000
@@ -17,7 +17,7 @@ tests['test note on'] = function(assert) {
   assert.equal(ch.off, 0, 'trigger offset');
 };
 
-tests['test instrument trigger'] = function(assert) {
+exports['test instrument trigger'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
   xm.patterns[0][0][0] = [48, 1, 0x10 + 0x33, 0, 0];  // C-4  1 33 000
@@ -37,7 +37,7 @@ tests['test instrument trigger'] = function(assert) {
   assert.equal(ch.off, 0, 'set offset=0');
 };
 
-tests['test note trigger'] = function(assert) {
+exports['test note trigger'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
   xm.patterns[0][0][0] = [48, 1, 0x10 + 0x33, 0, 0];  // C-4  1 33 000
diff --git a/test/testdata.js b/test/testdata.js
index ed04dec..0ca0568 100644
--- a/test/testdata.js
+++ b/test/testdata.js
@@ -22,6 +22,7 @@ exports.resetXMData = function() {
     mute: 0,
     volE: 0, panE: 0,
     retrig: 0,
+    vibratopos: 0,
     vibratodepth: 1,
     vibratospeed: 1,
   });
diff --git a/xm.js b/xm.js
index 5b28d9f..ff31034 100644
--- a/xm.js
+++ b/xm.js
@@ -226,10 +226,9 @@ function nextRow() {
       if (ch.effect != 9) ch.off = 0;
       ch.release = 0;
       ch.envtick = 0;
-      ch.vibratopos = 0;
       ch.env_vol = new EnvelopeFollower(inst.env_vol);
       ch.env_pan = new EnvelopeFollower(inst.env_pan);
-      if (ch.note != undefined) {
+      if (ch.note) {
         ch.period = periodForNote(ch, ch.note);
       }
     }
@@ -287,25 +286,31 @@ EnvelopeFollower.prototype.Tick = function(release) {
 
 function nextTick() {
   player.cur_tick++;
+  var j, ch;
+  for (j = 0; j < player.xm.nchan; j++) {
+    ch = player.xm.channelinfo[j];
+    ch.periodoffset = 0;
+  }
   if (player.cur_tick >= player.xm.tempo) {
     player.cur_tick = 0;
     nextRow();
   }
-  for (var j = 0; j < player.xm.nchan; j++) {
-    var ch = player.xm.channelinfo[j];
+  for (j = 0; j < player.xm.nchan; j++) {
+    ch = player.xm.channelinfo[j];
     var inst = ch.inst;
-    ch.periodoffset = 0;
-    if (player.cur_tick != 0) {
+    if (player.cur_tick !== 0) {
       if(ch.voleffectfn) ch.voleffectfn(ch);
       if(ch.effectfn) ch.effectfn(ch);
     }
     if (isNaN(ch.period)) {
-      console.log(prettify_notedata(player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
+      console.log(prettify_notedata(
+            player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
           "set channel", j, "period to NaN");
     }
-    if (inst == undefined) continue;
-    if (ch.env_vol == undefined) {
-      console.log(prettify_notedata(player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
+    if (inst === undefined) continue;
+    if (ch.env_vol === undefined) {
+      console.log(prettify_notedata(
+            player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
           "set channel", j, "env_vol to undefined, but note is playing");
       continue;
     }
@@ -655,6 +660,7 @@ function load(arrayBuf) {
       mute: 0,
       volE: 0, panE: 0,
       retrig: 0,
+      vibratopos: 0,
       vibratodepth: 1,
       vibratospeed: 1,
     });
diff --git a/xmeffects.js b/xmeffects.js
index ef429fa..5832d3d 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -61,13 +61,14 @@ function eff_t0_4(ch, data) {  // vibrato
   if (data >> 4) {
     ch.vibratospeed = data >> 4;
   }
-  eff_t1_4(ch, data);
+  eff_t1_4(ch);
 }
 
 function eff_t1_4(ch) {  // vibrato
   ch.periodoffset = Math.sin(ch.vibratopos * Math.PI / 32) * ch.vibratodepth;
   if (isNaN(ch.periodoffset)) {
-    console.log("vibrato periodoffset NaN?", ch.vibratopos, ch.vibratodepth);
+    console.log("vibrato periodoffset NaN?",
+        ch.vibratopos, ch.vibratospeed, ch.vibratodepth);
     ch.periodoffset = 0;
   }
   ch.vibratopos += ch.vibratospeed;

From 1f2b0ba41942ab858d8375a65c9e9f5e32003112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Fri, 13 Nov 2015 23:43:18 +0100
Subject: [PATCH 29/65] Add safeguards when setting cur_pat

---
 xm.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/xm.js b/xm.js
index ff31034..1552f82 100644
--- a/xm.js
+++ b/xm.js
@@ -107,13 +107,37 @@ function periodForNote(ch, note) {
   return 1920 - (note + ch.samp.note)*16 - ch.samp.fine / 8.0;
 }
 
+function setCurrentPattern() {
+  var nextPat = player.xm.songpats[player.cur_songpos];
+
+  // check for out of range pattern index
+  while (nextPat >= player.xm.patterns.length) {
+    if (player.cur_songpos + 1 < player.xm.songpats.length) {
+      // first try skipping the position
+      player.cur_songpos++;
+    } else if ((player.cur_songpos === player.xm.song_looppos && player.cur_songpos !== 0)
+      || player.xm.song_looppos >= player.xm.songpats.length) {
+      // if we allready tried song_looppos or if song_looppos
+      // is out of range, go to the first position
+      player.cur_songpos = 0;
+    } else {
+      // try going to song_looppos
+      player.cur_songpos = player.xm.song_looppos;
+    }
+
+    nextPat = player.xm.songpats[player.cur_songpos];
+  }
+
+  player.cur_pat = nextPat;
+}
+
 function nextRow() {
   if (player.cur_pat == -1 || player.cur_row >= player.xm.patterns[player.cur_pat].length) {
     player.cur_row = 0;
     player.cur_songpos++;
     if (player.cur_songpos >= player.xm.songpats.length)
       player.cur_songpos = player.xm.song_looppos;
-    player.cur_pat = player.xm.songpats[player.cur_songpos];
+    setCurrentPattern();
   }
   var p = player.xm.patterns[player.cur_pat];
   var r = p[player.cur_row];

From fc6be2b2466be046864666484f42faa68c66e948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 14 Nov 2015 12:35:28 +0100
Subject: [PATCH 30/65] Add tests for non-existing song positions

---
 test/all.js | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)

diff --git a/test/all.js b/test/all.js
index c0a6053..aed5085 100644
--- a/test/all.js
+++ b/test/all.js
@@ -20,6 +20,110 @@ exports['test XM startup'] = function(assert) {
   assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
 };
 
+exports['test non-existing song position'] = function(assert) {
+  testdata.resetXMData();
+  // 2 existing patterns, 1 non-existing
+  XMPlayer.xm.songpats = [0, 1, 2]
+  // 1 channel, 1 row, 2 blank patterns
+  XMPlayer.xm.patterns = [
+    [[[-1, -1, -1, 0, 0]]],
+    [[[-1, -1, -1, 0, 0]]]
+  ];
+  XMPlayer.xm.tempo = 1;
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
+  assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
+  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
+  assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, 'return to song position 0');
+  assert.equal(XMPlayer.cur_pat, 0, 'return to pattern 0');
+};
+
+exports['test non-existing first song position'] = function(assert) {
+  testdata.resetXMData();
+  // 2 existing patterns, 1 non-existing
+  XMPlayer.xm.songpats = [2, 0, 1]
+  // 1 channel, 1 row, 2 blank patterns
+  XMPlayer.xm.patterns = [
+    [[[-1, -1, -1, 0, 0]]],
+    [[[-1, -1, -1, 0, 0]]]
+  ];
+  XMPlayer.xm.tempo = 1;
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
+  assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 2, 'advance to song position 2');
+  assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
+};
+
+exports['test multiple non-existing song positions'] = function(assert) {
+  testdata.resetXMData();
+  // 2 existing patterns, 2 non-existing
+  XMPlayer.xm.songpats = [2, 0, 3, 1]
+  // 1 channel, 1 row, 2 blank patterns
+  XMPlayer.xm.patterns = [
+    [[[-1, -1, -1, 0, 0]]],
+    [[[-1, -1, -1, 0, 0]]]
+  ];
+  XMPlayer.xm.tempo = 1;
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
+  assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 3, 'advance to song position 3');
+  assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
+};
+
+exports['test non-existing song position with loop'] = function(assert) {
+  testdata.resetXMData();
+  // 2 existing patterns, 1 non-existing
+  XMPlayer.xm.songpats = [0, 1, 2]
+  // 1 channel, 1 row, 2 blank patterns
+  XMPlayer.xm.patterns = [
+    [[[-1, -1, -1, 0, 0]]],
+    [[[-1, -1, -1, 0, 0]]]
+  ];
+  XMPlayer.xm.song_looppos = 1;
+  XMPlayer.xm.tempo = 1;
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
+  assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
+  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
+  assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 1, 'replay song position 1');
+  assert.equal(XMPlayer.cur_pat, 1, 'replay pattern 1');
+};
+
+exports['test non-existing song position with invalid loop'] = function(assert) {
+  testdata.resetXMData();
+  // 2 existing patterns, 1 non-existing
+  XMPlayer.xm.songpats = [0, 1, 2]
+  // 1 channel, 1 row, 2 blank patterns
+  XMPlayer.xm.patterns = [
+    [[[-1, -1, -1, 0, 0]]],
+    [[[-1, -1, -1, 0, 0]]]
+  ];
+  XMPlayer.xm.song_looppos = 4;
+  XMPlayer.xm.tempo = 1;
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
+  assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
+  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
+  assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, 'return to song position 0');
+  assert.equal(XMPlayer.cur_pat, 0, 'return to pattern 0');
+};
+
 exports['test instruments'] = require('./instrument.js');
 exports['test effects'] = require('./effects.js');
 

From b04e6c00b0824d3dc409b48e8c3cdba5854ce3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Fri, 13 Nov 2015 22:06:43 +0100
Subject: [PATCH 31/65] Introduce a global volume variable

---
 xm.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xm.js b/xm.js
index ff31034..462b42e 100644
--- a/xm.js
+++ b/xm.js
@@ -22,6 +22,7 @@ player.cur_row = 64;
 player.cur_ticksamp = 0;
 player.cur_tick = 6;
 player.xm = {};  // contains all song data
+player.xm.global_volume = player.max_global_volume = 128;
 
 // exposed for testing
 player.nextTick = nextTick;
@@ -369,8 +370,8 @@ function MixChannelIntoBuf(ch, start, end, dataL, dataR) {
   var volE = ch.volE / 64.0;    // current volume envelope
   var panE = 4*(ch.panE - 32);  // current panning envelope
   var p = panE + ch.pan - 128;  // final pan
-  var volL = volE * (128 - p) * ch.vol / 8192.0;
-  var volR = volE * (128 + p) * ch.vol / 8192.0;
+  var volL = player.xm.global_volume * volE * (128 - p) * ch.vol / (64 * 128 * 128);
+  var volR = player.xm.global_volume * volE * (128 + p) * ch.vol / (64 * 128 * 128);
   if (volL < 0) volL = 0;
   if (volR < 0) volR = 0;
   if (volR === 0 && volL === 0)
@@ -645,6 +646,7 @@ function load(arrayBuf) {
   player.xm.tempo = dv.getUint16(0x4c, true);
   player.xm.bpm = dv.getUint16(0x4e, true);
   player.xm.channelinfo = [];
+  player.xm.global_volume = player.max_global_volume;
 
   var i, j, k;
 
@@ -915,6 +917,7 @@ function stop() {
   player.cur_row = 64;
   player.cur_songpos = -1;
   player.cur_ticksamp = 0;
+  player.xm.global_volume = player.max_global_volume;
   if (XMView.stop) XMView.stop();
   init();
 }

From eff3fd1ed6dfcb72a1817ae6ebdea8748bd95d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 14 Nov 2015 13:04:29 +0100
Subject: [PATCH 32/65] Implement the Gxx effect

---
 xmeffects.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/xmeffects.js b/xmeffects.js
index 5832d3d..7dffb75 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -182,6 +182,16 @@ function eff_t0_f(ch, data) {  // set tempo
   }
 }
 
+function eff_t0_g(ch, data) {  // set global volume
+  if (data <= 0x40) {
+    // volume gets multiplied by 2 to match
+    // the initial max global volume of 128
+    player.xm.global_volume = Math.max(0, data * 2);
+  } else {
+    player.xm.global_volume = player.max_global_volume;
+  }
+}
+
 function eff_t0_r(ch, data) {  // retrigger
   if (data & 0x0f) ch.retrig = (ch.retrig & 0xf0) + (data & 0x0f);
   if (data & 0xf0) ch.retrig = (ch.retrig & 0x0f) + (data & 0xf0);
@@ -234,7 +244,7 @@ player.effects_t0 = [  // effect functions on tick 0
   eff_t0_d,  // d
   eff_t0_e,  // e
   eff_t0_f,  // f
-  eff_unimplemented_t0,  // g
+  eff_t0_g,  // g
   eff_unimplemented_t0,  // h
   eff_unimplemented_t0,  // i
   eff_unimplemented_t0,  // j
@@ -273,7 +283,7 @@ player.effects_t1 = [  // effect functions on tick 1+
   null,   // d
   eff_t1_e,  // e
   null,   // f
-  eff_unimplemented,  // g
+  null,  // g
   eff_unimplemented,  // h
   eff_unimplemented,  // i
   eff_unimplemented,  // j

From 88584b9cd09d1c48cabdf959f771ea484308c607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 14 Nov 2015 13:04:43 +0100
Subject: [PATCH 33/65] Add test case for Gxx

---
 test/effects.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/test/effects.js b/test/effects.js
index 247fec6..056c2ef 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -152,3 +152,25 @@ exports['test 4xy vibrato'] = function(assert) {
   assert.equal(p.toFixed(3), "-1.546", 'row 5 tick 1 period -1.546');
 };
 
+exports['test Gxx global volume'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  // 1 channel, 3 row blank pattern
+  xm.patterns = [
+    [
+      [[48, 1, -1, 16, 0x40]], // C-4  1 -- G40
+      [[48, 1, -1, 16, 0x2B]], // C-4  1 -- G2B
+      // test out of bounds volume
+      [[48, 1, -1, 16, 0x80]]  // C-4  1 -- G80
+    ]
+  ];
+  XMPlayer.xm.tempo = 1;
+  XMPlayer.nextTick();
+  // volume gets multiplied by 2 to match
+  // the initial max global volume of 128
+  assert.equal(XMPlayer.xm.global_volume, 0x40*2, 'global volume set to 0x40');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.xm.global_volume, 0x2B*2, 'global volume set to 0x2B');
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.xm.global_volume, 0x40*2, 'global volume set to 0x40');
+};

From 8fe05fb89d1e4ec395df63579f41ae24204bcaff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 14 Nov 2015 13:07:51 +0100
Subject: [PATCH 34/65] Remove Gxx from missing effects

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 0dfe25d..7dca2ce 100644
--- a/index.html
+++ b/index.html
@@ -74,7 +74,7 @@ todo:
  - missing XM effects:
    - E3x, E4x, E5x, E6x, E7x, E9x, EDx, EEx
    - 7xy - tremolo
-   - Gxx, Hxy, Kxx, Lxx, Pxy, Txy
+   - Hxy, Kxx, Lxx, Pxy, Txy
  - render pattern with the wider fonts for fewer channels
  - fix occasional rendering/audio hiccups when switching songs
 </pre>

From 267ecbeffb4b3b068dd30fb9e247def997f149aa Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Sat, 14 Nov 2015 08:27:17 -0800
Subject: [PATCH 35/65] test for effect Axy

---
 test/effects.js  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 test/testdata.js |  2 +-
 xmeffects.js     |  6 +-----
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/test/effects.js b/test/effects.js
index 247fec6..a8f15c6 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -152,3 +152,51 @@ exports['test 4xy vibrato'] = function(assert) {
   assert.equal(p.toFixed(3), "-1.546", 'row 5 tick 1 period -1.546');
 };
 
+exports['test Axy volume slide'] = function(assert) {
+  var xm = testdata.resetXMData();
+  XMPlayer.xm.tempo = 6;
+
+  xm.patterns[0] = [
+    [[48,  1, -1, 10, 0x0f]],  // C-4  1 -- A0f (slide down)
+    [[-1, -1, -1, 10, 0x90]],  // --- -- -- A90 (slide up)
+    [[-1, -1, -1, 10, 0x00]],  // --- -- -- A00 (continue same)
+    [[-1, -1, 0x30, 10, 0x11]],  // --- -- 20 A11 (invalid, do nothing)
+  ];
+  var ch = xm.channelinfo[0];
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 64, 'row 0 tick 0 vol 64');
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 49, 'row 0 tick 1 vol 49');
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 34, 'row 0 tick 2 vol 34');
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 19, 'row 0 tick 3 vol 19');
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 4, 'row 0 tick 4 vol 4');
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 0, 'row 0 tick 5 vol 0');
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 0, 'row 1 tick 0 vol 0');
+  XMPlayer.nextTick();
+  assert.equal(ch.vol, 9, 'row 1 tick 1 vol 9');
+  XMPlayer.nextTick();  // row 1 tick 2
+  XMPlayer.nextTick();  // tick 3
+  XMPlayer.nextTick();  // tick 4
+  XMPlayer.nextTick();  // tick 5
+  assert.equal(ch.vol, 45, 'row 1 tick 5 vol 45');
+  XMPlayer.nextTick();  // row 2 tick 0
+  assert.equal(ch.vol, 45, 'row 2 tick 0 vol 45');
+  XMPlayer.nextTick();  // row 2 tick 1
+  assert.equal(ch.vol, 54, 'row 2 tick 1 vol 54');
+  XMPlayer.nextTick();  // tick 2
+  XMPlayer.nextTick();  // tick 3
+  assert.equal(ch.vol, 64, 'row 2 tick 3 vol 64');
+  XMPlayer.nextTick();  // tick 4
+  XMPlayer.nextTick();  // tick 5
+  XMPlayer.nextTick();  // row 3 tick 0
+  assert.equal(ch.vol, 32, 'row 3 tick 0 vol 32');
+  XMPlayer.nextTick();  // tick 1
+  assert.equal(ch.vol, 32, 'row 3 tick 1 vol 32');
+  XMPlayer.nextTick();  // tick 2
+  assert.equal(ch.vol, 32, 'row 3 tick 2 vol 32');
+};
diff --git a/test/testdata.js b/test/testdata.js
index 0ca0568..8157cd9 100644
--- a/test/testdata.js
+++ b/test/testdata.js
@@ -52,6 +52,6 @@ exports.resetXMData = function() {
   // reset song position
   XMPlayer.cur_songpos = -1;
   XMPlayer.cur_pat = -1;
-  XMPlayer.cur_tick = xm.tempo;
+  XMPlayer.cur_tick = 64;
   return xm;
 };
diff --git a/xmeffects.js b/xmeffects.js
index 5832d3d..6c27a99 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -95,11 +95,7 @@ function eff_t0_9(ch, data) {  // sample offset
 
 function eff_t0_a(ch, data) {  // volume slide
   if (data) {
-    if (data & 0x0f) {
-      ch.volumeslide = -(data & 0x0f);
-    } else {
-      ch.volumeslide = data >> 4;
-    }
+    ch.volumeslide = -(data & 0x0f) + (data >> 4);
   }
 }
 

From 660729010bff778c13b06c875b2c675adfb6b9af Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Sat, 14 Nov 2015 08:30:35 -0800
Subject: [PATCH 36/65] jshint cleanup of xmeffects

---
 xmeffects.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xmeffects.js b/xmeffects.js
index 6c27a99..7791cb5 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -5,7 +5,7 @@ if (!window.XMPlayer) {
 var player = window.XMPlayer;
 
 function eff_t1_0(ch) {  // arpeggio
-  if (ch.effectdata != 0 && ch.inst != undefined) {
+  if (ch.effectdata !== 0 && ch.inst !== undefined) {
     var arpeggio = [0, ch.effectdata>>4, ch.effectdata&15];
     var note = ch.note + arpeggio[player.cur_tick % 3];
     ch.period = player.periodForNote(ch, note);
@@ -13,7 +13,7 @@ function eff_t1_0(ch) {  // arpeggio
 }
 
 function eff_t0_1(ch, data) {  // pitch slide up
-  if (data != 0) {
+  if (data !== 0) {
     ch.slideupspeed = data;
   }
 }
@@ -26,7 +26,7 @@ function eff_t1_1(ch) {  // pitch slide up
 }
 
 function eff_t0_2(ch, data) {  // pitch slide down
-  if (data != 0) {
+  if (data !== 0) {
     ch.slidedownspeed = data;
   }
 }
@@ -39,7 +39,7 @@ function eff_t1_2(ch) {  // pitch slide down
 }
 
 function eff_t0_3(ch, data) {  // portamento
-  if (data != 0) {
+  if (data !== 0) {
     ch.portaspeed = data;
   }
 }
@@ -138,13 +138,13 @@ function eff_t0_e(ch, data) {  // extended effects!
       ch.pan = data * 0x11;
       break;
     case 0x0a:  // fine vol slide up (with memory)
-      if (data == 0 && ch.finevolup != undefined)
+      if (data === 0 && ch.finevolup !== undefined)
         data = ch.finevolup;
       ch.vol = Math.min(64, ch.vol + data);
       ch.finevolup = data;
       break;
     case 0x0b:  // fine vol slide down
-      if (data == 0 && ch.finevoldown != undefined)
+      if (data === 0 && ch.finevoldown !== undefined)
         data = ch.finevoldown;
       ch.vol = Math.max(0, ch.vol - data);
       ch.finevoldown = data;
@@ -168,7 +168,7 @@ function eff_t1_e(ch) {  // note cut
 }
 
 function eff_t0_f(ch, data) {  // set tempo
-  if (data == 0) {
+  if (data === 0) {
     console.log("tempo 0?");
     return;
   } else if (data < 0x20) {
@@ -203,7 +203,7 @@ function eff_t0_r(ch, data) {  // retrigger
 }
 
 function eff_t1_r(ch) {
-  if (player.cur_tick % (ch.retrig & 0x0f) == 0) {
+  if (player.cur_tick % (ch.retrig & 0x0f) === 0) {
     ch.off = 0;
   }
 }

From 05216f5ce0ee54241ff56c214b059c72ab9dfa90 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Sat, 14 Nov 2015 09:29:08 -0800
Subject: [PATCH 37/65] implement E5x finetune override

nf_chill.xm just needs EDx now
---
 test/effects.js | 39 ++++++++++++++++++++++++++++++++-------
 xm.js           |  4 +++-
 xmeffects.js    |  3 +++
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/test/effects.js b/test/effects.js
index 19f1112..8823fa6 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -1,11 +1,14 @@
 var XMPlayer = window.XMPlayer;
 
-// TODO:
-//  - portamento 3xx
-//  - vibrato 4xy
-//  - volume slide Axy
-//  - porta+vol 5xy
-//  - etc etc
+// tests TODO:
+//  - bxx: song jump
+//  - dxx: pattern jump
+//  - rxy: retrigger w/ volume changes
+// low priority TODO (trivial or already covered by other tests):
+//  - 5xy: porta+vol
+//  - 6xy: vibrato+vol
+//  - 8xx: panning
+//  - 9xx: sample offset
 
 exports['test 0xy arpeggio'] = function(assert) {
   var xm = testdata.resetXMData();
@@ -204,7 +207,6 @@ exports['test Axy volume slide'] = function(assert) {
 exports['test Gxx global volume'] = function(assert) {
   var xm = testdata.resetXMData();
   // [pat][row][channel]
-  // 1 channel, 3 row blank pattern
   xm.patterns = [
     [
       [[48, 1, -1, 16, 0x40]], // C-4  1 -- G40
@@ -223,3 +225,26 @@ exports['test Gxx global volume'] = function(assert) {
   XMPlayer.nextTick();
   assert.equal(XMPlayer.xm.global_volume, 0x40*2, 'global volume set to 0x40');
 };
+
+exports['test E5x finetune override'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // [pat][row][channel]
+  xm.instruments[0].samples[0].fine = -4;
+  xm.patterns = [
+    [
+      [[48, 1, -1,  0, 0x00]], // C-4  1 -- 000  (sample finetune -4)
+      [[48, 1, -1, 14, 0x50]], // C-4  1 -- E50  (finetune -128)
+      [[48, 1, -1, 14, 0x5f]]  // C-4  1 -- E5f  (finetune +127)
+    ]
+  ];
+  xm.tempo = 1;
+  var ch = xm.channelinfo[0];
+  XMPlayer.nextTick();
+  var f0 = ch.doff;
+  XMPlayer.nextTick();
+  var f1 = 12 * 128 * Math.log(ch.doff / f0) / Math.log(2);
+  assert.equal(f1.toFixed(2), "-124.00", "E50 finetune -128");
+  XMPlayer.nextTick();
+  var f2 = 12 * 128 * Math.log(ch.doff / f0) / Math.log(2);
+  assert.equal(f2.toFixed(2), "131.00", "E50 finetune +127");
+};
diff --git a/xm.js b/xm.js
index 61577bf..00bb12b 100644
--- a/xm.js
+++ b/xm.js
@@ -105,7 +105,7 @@ function updateChannelPeriod(ch, period) {
 }
 
 function periodForNote(ch, note) {
-  return 1920 - (note + ch.samp.note)*16 - ch.samp.fine / 8.0;
+  return 1920 - (note + ch.samp.note)*16 - ch.fine / 8.0;
 }
 
 function setCurrentPattern() {
@@ -158,6 +158,7 @@ function nextRow() {
           ch.samp = inst.samples[inst.samplemap[ch.note]];
           ch.vol = ch.samp.vol;
           ch.pan = ch.samp.pan;
+          ch.fine = ch.samp.fine;
         }
       } else {
         // console.log("invalid inst", r[i][1], instruments.length);
@@ -179,6 +180,7 @@ function nextRow() {
             // (potentially) new sample
             ch.pan = ch.samp.pan;
             ch.vol = ch.samp.vol;
+            ch.fine = ch.samp.fine;
           }
           triggernote = true;
         }
diff --git a/xmeffects.js b/xmeffects.js
index 83d1535..0976b51 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -134,6 +134,9 @@ function eff_t0_e(ch, data) {  // extended effects!
     case 2:  // fine porta down
       ch.period += data;
       break;
+    case 5:  // finetune
+      ch.fine = (data<<4) + data - 128;
+      break;
     case 8:  // panning
       ch.pan = data * 0x11;
       break;

From c35bb07fac7b32230d68f47602c7cc2d7067248e Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Sat, 14 Nov 2015 09:37:15 -0800
Subject: [PATCH 38/65] fix some wrong comments here and there

---
 test/effects.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/effects.js b/test/effects.js
index 8823fa6..ed147ac 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -90,7 +90,6 @@ exports['test 4xy vibrato'] = function(assert) {
   var xm = testdata.resetXMData();
   // vibrato 4xy: speed x, depth y
   // full cycle is 64/speed
-  // [pat][row][channel]
   xm.patterns[0] = [
     [[48,  1, -1, 4, 0x81]],  // C-4  1 -- 481
     [[-1, -1, -1, 4, 0x02]],  // --- -- -- 402
@@ -206,7 +205,6 @@ exports['test Axy volume slide'] = function(assert) {
 
 exports['test Gxx global volume'] = function(assert) {
   var xm = testdata.resetXMData();
-  // [pat][row][channel]
   xm.patterns = [
     [
       [[48, 1, -1, 16, 0x40]], // C-4  1 -- G40
@@ -228,7 +226,7 @@ exports['test Gxx global volume'] = function(assert) {
 
 exports['test E5x finetune override'] = function(assert) {
   var xm = testdata.resetXMData();
-  // [pat][row][channel]
+  // set an initial finetune so we know we're overriding it...
   xm.instruments[0].samples[0].fine = -4;
   xm.patterns = [
     [
@@ -242,9 +240,10 @@ exports['test E5x finetune override'] = function(assert) {
   XMPlayer.nextTick();
   var f0 = ch.doff;
   XMPlayer.nextTick();
+  // compare frequency relative to original finetune -4 note
   var f1 = 12 * 128 * Math.log(ch.doff / f0) / Math.log(2);
   assert.equal(f1.toFixed(2), "-124.00", "E50 finetune -128");
   XMPlayer.nextTick();
   var f2 = 12 * 128 * Math.log(ch.doff / f0) / Math.log(2);
-  assert.equal(f2.toFixed(2), "131.00", "E50 finetune +127");
+  assert.equal(f2.toFixed(2), "131.00", "E5f finetune +127");
 };

From 0e82964315880df34ec7f8a48b3c9e8e3bbaa157 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Sat, 14 Nov 2015 09:38:43 -0800
Subject: [PATCH 39/65] add license field to package.json

I was certain I had already added it, but somehow it went missing.
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 05c84f0..3c3e82b 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "uri": "http://www.a1k0n.net/code/jsxm/",
   "repository": "a1k0n/jsxm",
   "author": "Andy Sloane <andy@a1k0n.net> (http://www.a1k0n.net/)",
+  "license": "MIT",
 
   "main": "index.html",
   "window": {

From 0f3888cfffa82900d25657e8c2c48ee861255762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sun, 15 Nov 2015 00:37:35 +0100
Subject: [PATCH 40/65] Implement the Hxy effect

---
 xmeffects.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/xmeffects.js b/xmeffects.js
index 0976b51..45b6319 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -191,6 +191,20 @@ function eff_t0_g(ch, data) {  // set global volume
   }
 }
 
+function eff_t0_h(ch, data) {  // global volume slide
+  if (data) {
+    // same as Axy but multiplied by 2
+    player.xm.global_volumeslide = (-(data & 0x0f) + (data >> 4)) * 2;
+  }
+}
+
+function eff_t1_h(ch) {  // global volume slide
+  if (player.xm.global_volumeslide !== undefined) {
+    player.xm.global_volume = Math.max(0, Math.min(player.max_global_volume,
+      player.xm.global_volume + player.xm.global_volumeslide));
+  }
+}
+
 function eff_t0_r(ch, data) {  // retrigger
   if (data & 0x0f) ch.retrig = (ch.retrig & 0xf0) + (data & 0x0f);
   if (data & 0xf0) ch.retrig = (ch.retrig & 0x0f) + (data & 0xf0);
@@ -244,7 +258,7 @@ player.effects_t0 = [  // effect functions on tick 0
   eff_t0_e,  // e
   eff_t0_f,  // f
   eff_t0_g,  // g
-  eff_unimplemented_t0,  // h
+  eff_t0_h,  // h
   eff_unimplemented_t0,  // i
   eff_unimplemented_t0,  // j
   eff_unimplemented_t0,  // k
@@ -283,7 +297,7 @@ player.effects_t1 = [  // effect functions on tick 1+
   eff_t1_e,  // e
   null,   // f
   null,  // g
-  eff_unimplemented,  // h
+  eff_t1_h,  // h
   eff_unimplemented,  // i
   eff_unimplemented,  // j
   eff_unimplemented,  // k

From 007f0db8f7e076e53609d833f99a73268d17e000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sun, 15 Nov 2015 00:37:46 +0100
Subject: [PATCH 41/65] Add test case for Hxy

---
 test/effects.js | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/test/effects.js b/test/effects.js
index ed147ac..40ed393 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -224,6 +224,55 @@ exports['test Gxx global volume'] = function(assert) {
   assert.equal(XMPlayer.xm.global_volume, 0x40*2, 'global volume set to 0x40');
 };
 
+exports['test Hxy global volume slide'] = function(assert) {
+  var xm = testdata.resetXMData();
+  xm.tempo = 6;
+  xm.global_volume = 128;
+
+  xm.patterns[0] = [
+    [[48,  1, -1, 17, 0x0f]],  // C-4  1 -- H0f (slide down)
+    [[-1, -1, -1, 17, 0x90]],  // --- -- -- H90 (slide up)
+    [[-1, -1, -1, 17, 0x00]],  // --- -- -- H00 (continue same)
+    [[-1, -1, 0x30, 17, 0x11]],  // --- -- 30 H11 (invalid, do nothing)
+  ];
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 128, 'row 0 tick 0 vol 128');
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 98, 'row 0 tick 1 vol 98');
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 68, 'row 0 tick 2 vol 68');
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 38, 'row 0 tick 3 vol 38');
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 8, 'row 0 tick 4 vol 8');
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 0, 'row 0 tick 5 vol 0');
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 0, 'row 1 tick 0 vol 0');
+  XMPlayer.nextTick();
+  assert.equal(xm.global_volume, 18, 'row 1 tick 1 vol 18');
+  XMPlayer.nextTick();  // row 1 tick 2
+  XMPlayer.nextTick();  // tick 3
+  XMPlayer.nextTick();  // tick 4
+  XMPlayer.nextTick();  // tick 5
+  assert.equal(xm.global_volume, 90, 'row 1 tick 5 vol 90');
+  XMPlayer.nextTick();  // row 2 tick 0
+  assert.equal(xm.global_volume, 90, 'row 2 tick 0 vol 90');
+  XMPlayer.nextTick();  // row 2 tick 1
+  assert.equal(xm.global_volume, 108, 'row 2 tick 1 vol 108');
+  XMPlayer.nextTick();  // tick 2
+  XMPlayer.nextTick();  // tick 3
+  assert.equal(xm.global_volume, 128, 'row 2 tick 3 vol 128');
+  XMPlayer.nextTick();  // tick 4
+  XMPlayer.nextTick();  // tick 5
+  XMPlayer.nextTick();  // row 3 tick 0
+  assert.equal(xm.global_volume, 128, 'row 3 tick 0 vol 128');
+  XMPlayer.nextTick();  // tick 1
+  assert.equal(xm.global_volume, 128, 'row 3 tick 1 vol 128');
+  XMPlayer.nextTick();  // tick 2
+  assert.equal(xm.global_volume, 128, 'row 3 tick 2 vol 128');
+};
+
 exports['test E5x finetune override'] = function(assert) {
   var xm = testdata.resetXMData();
   // set an initial finetune so we know we're overriding it...

From be1c0df30d01242ca0744215fbe5bb71f55ae57b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sun, 15 Nov 2015 00:38:55 +0100
Subject: [PATCH 42/65] Remove Hxy from missing effects

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 7dca2ce..ad8ed09 100644
--- a/index.html
+++ b/index.html
@@ -74,7 +74,7 @@ todo:
  - missing XM effects:
    - E3x, E4x, E5x, E6x, E7x, E9x, EDx, EEx
    - 7xy - tremolo
-   - Hxy, Kxx, Lxx, Pxy, Txy
+   - Kxx, Lxx, Pxy, Txy
  - render pattern with the wider fonts for fewer channels
  - fix occasional rendering/audio hiccups when switching songs
 </pre>

From 215f72c19d7f02d249b90007ec093dbb89493384 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Mon, 16 Nov 2015 18:47:41 -0800
Subject: [PATCH 43/65] Fix samples for instruments with >1 sample

The sample offset was incorrectly computed, and was including the sample
headers for all samples after the first one into the first sample's
data, causing various glitches at the beginning of the sample.

Fixes #10.
---
 xm.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xm.js b/xm.js
index 00bb12b..45f6e9c 100644
--- a/xm.js
+++ b/xm.js
@@ -802,9 +802,9 @@ function load(arrayBuf) {
         var samppan = dv.getUint8(idx+15);
         var sampnote = dv.getInt8(idx+16);
         var sampname = getstring(dv, idx+18, 22);
-        var sampleoffset = idx + samphdrsiz + totalsamples;
-        console.log("sample %d: len %d name '%s' loop %d/%d vol %d",
-            j, samplen, sampname, samploop, samplooplen, sampvol);
+        var sampleoffset = idx + nsamp * samphdrsiz + totalsamples;
+        console.log("sample %d: len %d name '%s' loop %d/%d vol %d offset %s",
+            j, samplen, sampname, samploop, samplooplen, sampvol, sampleoffset.toString(16));
         console.log("           type %d note %s(%d) finetune %d pan %d",
             samptype, prettify_note(sampnote + 12*4), sampnote, sampfinetune, samppan);
         console.log("           vol env", env_vol, env_vol_sustain,

From e347807abfdf7a1ef5880a894f0f59a800fac162 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Mon, 16 Nov 2015 18:59:46 -0800
Subject: [PATCH 44/65] Change cur_row to actually mean current row

It used to really mean "next row", and resulted in showing the wrong row
in the pattern view (row -1 instead of the last row).

Fixes #14.
---
 index.html         | 2 +-
 test/all.js        | 8 ++++----
 test/instrument.js | 4 ++--
 xm.js              | 8 ++++----
 xmeffects.js       | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/index.html b/index.html
index ad8ed09..0827785 100644
--- a/index.html
+++ b/index.html
@@ -72,7 +72,7 @@
 code: <a href="http://github.com/a1k0n/jsxm/">github.com/a1k0n/jsxm</a>
 todo:
  - missing XM effects:
-   - E3x, E4x, E5x, E6x, E7x, E9x, EDx, EEx
+   - E3x, E4x, E6x, E7x, E9x, EDx, EEx
    - 7xy - tremolo
    - Kxx, Lxx, Pxy, Txy
  - render pattern with the wider fonts for fewer channels
diff --git a/test/all.js b/test/all.js
index aed5085..e84bc0c 100644
--- a/test/all.js
+++ b/test/all.js
@@ -17,7 +17,7 @@ exports['test XM startup'] = function(assert) {
   assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
   assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
   assert.equal(XMPlayer.cur_tick, 0, 'advance to tick 0');
-  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+  assert.equal(XMPlayer.cur_row, 0, 'advance to row 0');
 };
 
 exports['test non-existing song position'] = function(assert) {
@@ -33,7 +33,7 @@ exports['test non-existing song position'] = function(assert) {
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
   assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
-  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+  assert.equal(XMPlayer.cur_row, 0, 'advance to row 0');
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
   assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
@@ -92,7 +92,7 @@ exports['test non-existing song position with loop'] = function(assert) {
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
   assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
-  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+  assert.equal(XMPlayer.cur_row, 0, 'advance to row 0');
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
   assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
@@ -115,7 +115,7 @@ exports['test non-existing song position with invalid loop'] = function(assert)
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 0, 'advance to initial song position');
   assert.equal(XMPlayer.cur_pat, 0, 'advance to pattern 0');
-  assert.equal(XMPlayer.cur_row, 1, 'advance to row 1');
+  assert.equal(XMPlayer.cur_row, 0, 'advance to row 0');
   XMPlayer.nextTick();
   assert.equal(XMPlayer.cur_songpos, 1, 'advance to song position 1');
   assert.equal(XMPlayer.cur_pat, 1, 'advance to pattern 1');
diff --git a/test/instrument.js b/test/instrument.js
index a7d399b..5bf1948 100644
--- a/test/instrument.js
+++ b/test/instrument.js
@@ -26,9 +26,9 @@ exports['test instrument trigger'] = function(assert) {
   XMPlayer.nextRow();
   ch.pan = 1;  // forcibly override panning
   ch.off = 100;  // and sample offset
-  assert.equal(XMPlayer.cur_row, 1, 'row 1');
+  assert.equal(XMPlayer.cur_row, 0, 'row 0');
   XMPlayer.nextRow();
-  assert.equal(XMPlayer.cur_row, 2, 'row 2');
+  assert.equal(XMPlayer.cur_row, 1, 'row 1');
   assert.equal(ch.note, 48, 'note same after inst trigger');
   assert.equal(ch.period, 1152, 'period same after inst trigger');
   assert.equal(ch.vol, 64, 'vol reset after inst trigger');
diff --git a/xm.js b/xm.js
index 45f6e9c..b6dcfeb 100644
--- a/xm.js
+++ b/xm.js
@@ -133,6 +133,7 @@ function setCurrentPattern() {
 }
 
 function nextRow() {
+  player.cur_row++;
   if (player.cur_pat == -1 || player.cur_row >= player.xm.patterns[player.cur_pat].length) {
     player.cur_row = 0;
     player.cur_songpos++;
@@ -142,7 +143,6 @@ function nextRow() {
   }
   var p = player.xm.patterns[player.cur_pat];
   var r = p[player.cur_row];
-  player.cur_row++;
   for (var i = 0; i < r.length; i++) {
     var ch = player.xm.channelinfo[i];
     var inst = ch.inst;
@@ -331,13 +331,13 @@ function nextTick() {
     }
     if (isNaN(ch.period)) {
       console.log(prettify_notedata(
-            player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
+            player.xm.patterns[player.cur_pat][player.cur_row][j]),
           "set channel", j, "period to NaN");
     }
     if (inst === undefined) continue;
     if (ch.env_vol === undefined) {
       console.log(prettify_notedata(
-            player.xm.patterns[player.cur_pat][player.cur_row-1][j]),
+            player.xm.patterns[player.cur_pat][player.cur_row][j]),
           "set channel", j, "env_vol to undefined, but note is playing");
       continue;
     }
@@ -590,7 +590,7 @@ function audio_cb(e) {
         scopes: scopes,
         songpos: player.cur_songpos,
         pat: player.cur_pat,
-        row: player.cur_row - 1
+        row: player.cur_row
       });
       offset += tickduration;
       player.cur_ticksamp += tickduration;
diff --git a/xmeffects.js b/xmeffects.js
index 45b6319..e6fe747 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -121,7 +121,7 @@ function eff_t0_d(ch, data) {  // pattern jump
   if (player.cur_songpos >= player.xm.songpats.length)
     player.cur_songpos = player.xm.song_looppos;
   player.cur_pat = player.xm.songpats[player.cur_songpos];
-  player.cur_row = data;
+  player.cur_row = data - 1;
 }
 
 function eff_t0_e(ch, data) {  // extended effects!

From 21e3f073d9f9d24954dc92775accaae4349140d2 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Mon, 16 Nov 2015 19:20:29 -0800
Subject: [PATCH 45/65] add test for Dxx effect

---
 test/effects.js | 33 +++++++++++++++++++++++++++++++++
 xmeffects.js    |  1 +
 2 files changed, 34 insertions(+)

diff --git a/test/effects.js b/test/effects.js
index 40ed393..6c3b531 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -154,6 +154,39 @@ exports['test 4xy vibrato'] = function(assert) {
   assert.equal(p.toFixed(3), "-1.546", 'row 5 tick 1 period -1.546');
 };
 
+exports['test dxx pattern jump'] = function(assert) {
+  var xm = testdata.resetXMData();
+  xm.tempo = 2;
+  xm.patterns[0] = [
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+    [[49,  1, -1, 0x0, 0x00]],  // C#4  1 -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+  ];
+  xm.patterns[1] = [
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+    [[48,  1, -1, 0xd, 0x01]],  // C-4  1 -- D01
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+  ];
+  xm.songpats = [1, 0];
+  XMPlayer.nextTick();  // play first, empty row (pattern 1)
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, "songpos 0");
+  assert.equal(XMPlayer.cur_pat, 1, "pattern 1");
+  assert.equal(XMPlayer.cur_row, 0, "row 0");
+
+  XMPlayer.nextTick();  // play C-4  1 -- D01 in pattern 1
+  XMPlayer.nextTick();  // we will jump to pattern 0 row 1 after this
+
+  assert.equal(xm.channelinfo[0].period, 1152, "play C-4 on Dxx row");
+
+  XMPlayer.nextTick();  // play C#4  1 -- 000 in pattern 0
+
+  assert.equal(xm.channelinfo[0].period, 1136, "play C#4 on following row");
+  assert.equal(XMPlayer.cur_songpos, 1, "songpos 0");
+  assert.equal(XMPlayer.cur_pat, 0, "pattern 1");
+  assert.equal(XMPlayer.cur_row, 1, "row 1");
+};
+
 exports['test Axy volume slide'] = function(assert) {
   var xm = testdata.resetXMData();
   XMPlayer.xm.tempo = 6;
diff --git a/xmeffects.js b/xmeffects.js
index e6fe747..e75d96f 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -109,6 +109,7 @@ function eff_t0_b(ch, data) {  // song jump (untested)
   if (data < player.xm.songpats.length) {
     player.cur_songpos = data;
     player.cur_pat = player.xm.songpats[player.cur_songpos];
+    player.cur_row = -1;
   }
 }
 

From bf138a245ca7dc2fbc1ec3bd9dad816b4b2f3160 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Mon, 16 Nov 2015 19:21:51 -0800
Subject: [PATCH 46/65] re-sort Dxx test

---
 test/effects.js | 66 ++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/test/effects.js b/test/effects.js
index 6c3b531..e30be1c 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -154,39 +154,6 @@ exports['test 4xy vibrato'] = function(assert) {
   assert.equal(p.toFixed(3), "-1.546", 'row 5 tick 1 period -1.546');
 };
 
-exports['test dxx pattern jump'] = function(assert) {
-  var xm = testdata.resetXMData();
-  xm.tempo = 2;
-  xm.patterns[0] = [
-    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
-    [[49,  1, -1, 0x0, 0x00]],  // C#4  1 -- 000
-    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
-  ];
-  xm.patterns[1] = [
-    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
-    [[48,  1, -1, 0xd, 0x01]],  // C-4  1 -- D01
-    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
-  ];
-  xm.songpats = [1, 0];
-  XMPlayer.nextTick();  // play first, empty row (pattern 1)
-  XMPlayer.nextTick();
-  assert.equal(XMPlayer.cur_songpos, 0, "songpos 0");
-  assert.equal(XMPlayer.cur_pat, 1, "pattern 1");
-  assert.equal(XMPlayer.cur_row, 0, "row 0");
-
-  XMPlayer.nextTick();  // play C-4  1 -- D01 in pattern 1
-  XMPlayer.nextTick();  // we will jump to pattern 0 row 1 after this
-
-  assert.equal(xm.channelinfo[0].period, 1152, "play C-4 on Dxx row");
-
-  XMPlayer.nextTick();  // play C#4  1 -- 000 in pattern 0
-
-  assert.equal(xm.channelinfo[0].period, 1136, "play C#4 on following row");
-  assert.equal(XMPlayer.cur_songpos, 1, "songpos 0");
-  assert.equal(XMPlayer.cur_pat, 0, "pattern 1");
-  assert.equal(XMPlayer.cur_row, 1, "row 1");
-};
-
 exports['test Axy volume slide'] = function(assert) {
   var xm = testdata.resetXMData();
   XMPlayer.xm.tempo = 6;
@@ -236,6 +203,39 @@ exports['test Axy volume slide'] = function(assert) {
   assert.equal(ch.vol, 32, 'row 3 tick 2 vol 32');
 };
 
+exports['test Dxx pattern jump'] = function(assert) {
+  var xm = testdata.resetXMData();
+  xm.tempo = 2;
+  xm.patterns[0] = [
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+    [[49,  1, -1, 0x0, 0x00]],  // C#4  1 -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+  ];
+  xm.patterns[1] = [
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+    [[48,  1, -1, 0xd, 0x01]],  // C-4  1 -- D01
+    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+  ];
+  xm.songpats = [1, 0];
+  XMPlayer.nextTick();  // play first, empty row (pattern 1)
+  XMPlayer.nextTick();
+  assert.equal(XMPlayer.cur_songpos, 0, "songpos 0");
+  assert.equal(XMPlayer.cur_pat, 1, "pattern 1");
+  assert.equal(XMPlayer.cur_row, 0, "row 0");
+
+  XMPlayer.nextTick();  // play C-4  1 -- D01 in pattern 1
+  XMPlayer.nextTick();  // we will jump to pattern 0 row 1 after this
+
+  assert.equal(xm.channelinfo[0].period, 1152, "play C-4 on Dxx row");
+
+  XMPlayer.nextTick();  // play C#4  1 -- 000 in pattern 0
+
+  assert.equal(xm.channelinfo[0].period, 1136, "play C#4 on following row");
+  assert.equal(XMPlayer.cur_songpos, 1, "songpos 0");
+  assert.equal(XMPlayer.cur_pat, 0, "pattern 1");
+  assert.equal(XMPlayer.cur_row, 1, "row 1");
+};
+
 exports['test Gxx global volume'] = function(assert) {
   var xm = testdata.resetXMData();
   xm.patterns = [

From 89e6b9c554cea3ec5a09c2928bffc5fd3c8e25a2 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Thu, 19 Nov 2015 20:24:00 -0800
Subject: [PATCH 47/65] fix Dxx effect

argument is BCD, so 0x10 actually means 10 decimal
---
 test/effects.js | 23 ++++++++++++++++-------
 xmeffects.js    |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/test/effects.js b/test/effects.js
index e30be1c..45ae79f 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -2,7 +2,6 @@ var XMPlayer = window.XMPlayer;
 
 // tests TODO:
 //  - bxx: song jump
-//  - dxx: pattern jump
 //  - rxy: retrigger w/ volume changes
 // low priority TODO (trivial or already covered by other tests):
 //  - 5xy: porta+vol
@@ -207,13 +206,23 @@ exports['test Dxx pattern jump'] = function(assert) {
   var xm = testdata.resetXMData();
   xm.tempo = 2;
   xm.patterns[0] = [
-    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
-    [[49,  1, -1, 0x0, 0x00]],  // C#4  1 -- 000
-    [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 00 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 01 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 02 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 03 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 04 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 05 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 06 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 07 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 08 --- -- -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 09 --- -- -- 000
+    [[49,  1, -1, 0x0, 0x00]],  // 0a C#4  1 -- 000
+    [[-1, -1, -1, 0x0, 0x00]],  // 0b --- -- -- 000
   ];
+  // argument is BCD, so 0x10 actually means 10 (decimal)
   xm.patterns[1] = [
     [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
-    [[48,  1, -1, 0xd, 0x01]],  // C-4  1 -- D01
+    [[48,  1, -1, 0xd, 0x10]],  // C-4  1 -- D10
     [[-1, -1, -1, 0x0, 0x00]],  // --- -- -- 000
   ];
   xm.songpats = [1, 0];
@@ -228,12 +237,12 @@ exports['test Dxx pattern jump'] = function(assert) {
 
   assert.equal(xm.channelinfo[0].period, 1152, "play C-4 on Dxx row");
 
-  XMPlayer.nextTick();  // play C#4  1 -- 000 in pattern 0
+  XMPlayer.nextTick();  // play row 0x0a C#4  1 -- 000 in pattern 0
 
   assert.equal(xm.channelinfo[0].period, 1136, "play C#4 on following row");
   assert.equal(XMPlayer.cur_songpos, 1, "songpos 0");
   assert.equal(XMPlayer.cur_pat, 0, "pattern 1");
-  assert.equal(XMPlayer.cur_row, 1, "row 1");
+  assert.equal(XMPlayer.cur_row, 10, "row 10");
 };
 
 exports['test Gxx global volume'] = function(assert) {
diff --git a/xmeffects.js b/xmeffects.js
index e75d96f..0e8a7f1 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -122,7 +122,7 @@ function eff_t0_d(ch, data) {  // pattern jump
   if (player.cur_songpos >= player.xm.songpats.length)
     player.cur_songpos = player.xm.song_looppos;
   player.cur_pat = player.xm.songpats[player.cur_songpos];
-  player.cur_row = data - 1;
+  player.cur_row = (data >> 4) * 10 + (data & 0x0f) - 1;
 }
 
 function eff_t0_e(ch, data) {  // extended effects!

From 34e975ef55c9eb77ed3869609d233574bda80f6c Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Thu, 19 Nov 2015 20:47:28 -0800
Subject: [PATCH 48/65] changed my mind: render 000 effect as ...

also make the track view much taller in the standalone player
---
 index.html   |  2 +-
 trackview.js | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 0827785..dff04a5 100644
--- a/index.html
+++ b/index.html
@@ -56,7 +56,7 @@
     <div><canvas class="centered" id='title' width="640" height="22"></canvas></div>
     <div class="hscroll">
       <div><canvas class="centered" id='vu' width="224" height="64"></canvas></div>
-      <div><canvas class="centered" id='gfxpattern' width="640" height="200"></canvas></div>
+      <div><canvas class="centered" id='gfxpattern' width="640" height="504"></canvas></div>
     </div>
     <div id='instruments'></div>
     <div>
diff --git a/trackview.js b/trackview.js
index 202a917..16c7ddd 100644
--- a/trackview.js
+++ b/trackview.js
@@ -115,6 +115,7 @@ function RenderPattern(canv, pattern) {
       // render note
       var note = data[0];
       if (note < 0) {
+        // no note = ...
         ctx.drawImage(fontimg, 0, 8*5, 16, 8, dx, dy, 16, 8);
       } else {
         var octave = (note/12)|0;
@@ -137,6 +138,7 @@ function RenderPattern(canv, pattern) {
       // render volume
       var vol = data[2];
       if (vol < 0x10) {
+        // no volume = ..
         ctx.drawImage(fontimg, 312, 0, 8, 8, dx, dy, 8, 8);
       } else {
         ctx.drawImage(fontimg, 8*(vol>>4) + 56*8, 4*8, 8, 8, dx, dy, 8, 8);
@@ -147,10 +149,17 @@ function RenderPattern(canv, pattern) {
       // render effect
       var eff = data[3];
       var effdata = data[4];
-      ctx.drawImage(fontimg, 8*eff + 16*8, 4*8, 8, 8, dx, dy, 8, 8);
-      dx += 8;
-      ctx.drawImage(fontimg, 8*(effdata>>4), 4*8, 4, 8, dx, dy, 4, 8);
-      ctx.drawImage(fontimg, 8*(effdata&15), 4*8, 4, 8, dx+4, dy, 4, 8);
+      if (eff !== 0 || effdata !== 0) {
+        // draw effect with tiny font (4px space + effect type 0..9a..z)
+        ctx.drawImage(fontimg, 8*eff + 16*8, 4*8, 8, 8, dx, dy, 8, 8);
+        dx += 8;
+        // (hexadecimal 4-width font)
+        ctx.drawImage(fontimg, 8*(effdata>>4), 4*8, 4, 8, dx, dy, 4, 8);
+        ctx.drawImage(fontimg, 8*(effdata&15), 4*8, 4, 8, dx+4, dy, 4, 8);
+      } else {
+        // no effect = ...
+        ctx.drawImage(fontimg, 0, 8*5, 16, 8, dx+2, dy, 16, 8);
+      }
     }
   }
 }

From 26795876545373ad0a8e3f6da540abdacfe1fb8d Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Fri, 20 Nov 2015 12:09:57 -0800
Subject: [PATCH 49/65] update screen if pattern changes without row changing

this is solely for strobe - CELL II, pretty much...
---
 trackview.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/trackview.js b/trackview.js
index 16c7ddd..52046bf 100644
--- a/trackview.js
+++ b/trackview.js
@@ -209,7 +209,7 @@ function redrawScreen() {
     }
   }
 
-  if (e.row != shown_row) {
+  if (e.row != shown_row || e.pat != pat_canvas_patnum) {
     if (e.pat != pat_canvas_patnum) {
       var p = player.xm.patterns[e.pat];
       if (p) {
@@ -217,6 +217,7 @@ function redrawScreen() {
         pat_canvas_patnum = e.pat;
       }
     }
+
     var gfx = document.getElementById("gfxpattern");
     ctx = gfx.getContext('2d');
     ctx.fillStyle = '#000';

From 8b3f318f60d8ad945c7b5c316bc5de1f20bb4c8a Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Fri, 20 Nov 2015 17:28:39 -0800
Subject: [PATCH 50/65] [#19] handle loops of length 0

also more robust way to find sample offsets to load in the file
---
 xm.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/xm.js b/xm.js
index b6dcfeb..dbc89bc 100644
--- a/xm.js
+++ b/xm.js
@@ -787,8 +787,8 @@ function load(arrayBuf) {
       // FIXME: ignoring keymaps for now and assuming 1 sample / instrument
       // var keymap = getarray(dv, idx+0x21);
       var samphdrsiz = dv.getUint32(idx+0x1d, true);
-      console.log("hdrsiz %d; instrument %d: '%s' %d samples, samphdrsiz %d",
-          hdrsiz, i, instname, nsamp, samphdrsiz);
+      console.log("hdrsiz %d; instrument %s: '%s' %d samples, samphdrsiz %d",
+          hdrsiz, (i+1).toString(16), instname, nsamp, samphdrsiz);
       idx += hdrsiz;
       var totalsamples = 0;
       var samps = [];
@@ -802,7 +802,10 @@ function load(arrayBuf) {
         var samppan = dv.getUint8(idx+15);
         var sampnote = dv.getInt8(idx+16);
         var sampname = getstring(dv, idx+18, 22);
-        var sampleoffset = idx + nsamp * samphdrsiz + totalsamples;
+        var sampleoffset = totalsamples;
+        if (samplooplen === 0) {
+          samptype &= ~3;
+        }
         console.log("sample %d: len %d name '%s' loop %d/%d vol %d offset %s",
             j, samplen, sampname, samploop, samplooplen, sampvol, sampleoffset.toString(16));
         console.log("           type %d note %s(%d) finetune %d pan %d",
@@ -816,24 +819,26 @@ function load(arrayBuf) {
           'len': samplen, 'loop': samploop,
           'looplen': samplooplen, 'note': sampnote, 'fine': sampfinetune,
           'pan': samppan, 'type': samptype, 'vol': sampvol,
-          'sampledata': ConvertSample(
-              new Uint8Array(arrayBuf, sampleoffset, samplen), samptype & 16),
+          'fileoffset': sampleoffset
         };
         // length / pointers are all specified in bytes; fixup for 16-bit samples
-        if (samptype & 16) {
+        samps.push(samp);
+        idx += samphdrsiz;
+        totalsamples += samplen;
+      }
+      for (j = 0; j < nsamp; j++) {
+        var samp = samps[j];
+        samp.sampledata = ConvertSample(
+            new Uint8Array(arrayBuf, idx + samp.fileoffset, samp.len), samp.type & 16);
+        if (samp.type & 16) {
           samp.len /= 2;
           samp.loop /= 2;
           samp.looplen /= 2;
         }
-
         // unroll short loops and any pingpong loops
         if ((samp.type & 3) && (samp.looplen < 2048 || (samp.type & 2))) {
           UnrollSampleLoop(samp);
         }
-        samps.push(samp);
-
-        idx += samphdrsiz;
-        totalsamples += samplen;
       }
       idx += totalsamples;
       inst.samplemap = samplemap;

From 65a2ea2863344188170e0407179da4d25112bb69 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Fri, 20 Nov 2015 17:42:01 -0800
Subject: [PATCH 51/65] [#5] implement volume effect vibrato

---
 test/effects.js | 19 +++++++++++++------
 xm.js           |  6 ++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/test/effects.js b/test/effects.js
index 45ae79f..b64f8a2 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -90,12 +90,13 @@ exports['test 4xy vibrato'] = function(assert) {
   // vibrato 4xy: speed x, depth y
   // full cycle is 64/speed
   xm.patterns[0] = [
-    [[48,  1, -1, 4, 0x81]],  // C-4  1 -- 481
-    [[-1, -1, -1, 4, 0x02]],  // --- -- -- 402
-    [[-1, -1, -1, 4, 0x10]],  // --- -- -- 410
-    [[-1, -1, -1, 4, 0x00]],  // --- -- -- 400
-    [[-1, -1, -1, 0, 0x00]],  // --- -- -- 000 - no vibrato
-    [[-1, -1, -1, 4, 0x00]],  // --- -- -- 400 - resume vibrato @ pos 0
+    [[48,  1, -1, 4, 0x81]],    // C-4  1 -- 481
+    [[-1, -1, -1, 4, 0x02]],    // --- -- -- 402
+    [[-1, -1, -1, 4, 0x10]],    // --- -- -- 410
+    [[-1, -1, -1, 4, 0x00]],    // --- -- -- 400
+    [[-1, -1, -1, 0, 0x00]],    // --- -- -- --- - no vibrato
+    [[-1, -1, -1, 4, 0x00]],    // --- -- -- 400 - resume vibrato @ pos 0
+    [[-1, -1, 0xb2, 0, 0x00]],  // --- -- V2 --- - volume effect vibrato
   ];
   // I should really be testing ch.doff directly
   XMPlayer.xm.tempo = 3;
@@ -151,6 +152,12 @@ exports['test 4xy vibrato'] = function(assert) {
   XMPlayer.nextTick();  // row 5 tick 1
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
   assert.equal(p.toFixed(3), "-1.546", 'row 5 tick 1 period -1.546');
+  XMPlayer.nextTick();  // row 5 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.414", 'row 5 tick 2 period -1.414');
+  XMPlayer.nextTick();  // row 6 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.269", 'row 6 tick 0 period -1.269');
 };
 
 exports['test Axy volume slide'] = function(assert) {
diff --git a/xm.js b/xm.js
index dbc89bc..cb9868e 100644
--- a/xm.js
+++ b/xm.js
@@ -207,6 +207,12 @@ function nextRow() {
         ch.vol = Math.max(0, ch.vol - (v & 0x0f));
       } else if (v >= 0x90 && v < 0xa0) {  // fine volume slide up
         ch.vol = Math.min(64, ch.vol + (v & 0x0f));
+      } else if (v >= 0xa0 && v < 0xb0) {  // vibrato speed
+        ch.vibratospeed = v & 0x0f;
+      } else if (v >= 0xb0 && v < 0xc0) {  // vibrato w/ depth
+        ch.vibratodepth = v & 0x0f;
+        ch.voleffectfn = player.effects_t1[4];  // use vibrato effect directly
+        player.effects_t1[4](ch);  // and also call it on tick 0
       } else if (v >= 0xc0 && v < 0xd0) {  // set panning
         ch.pan = (v & 0x0f) * 0x11;
       } else {

From fb103e61bc527e7c71a67b28c1277db3d097de0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 02:21:16 +0100
Subject: [PATCH 52/65] Read vibrato waveform type

---
 test/testdata.js | 1 +
 xm.js            | 1 +
 xmeffects.js     | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/test/testdata.js b/test/testdata.js
index 8157cd9..c8dd629 100644
--- a/test/testdata.js
+++ b/test/testdata.js
@@ -25,6 +25,7 @@ exports.resetXMData = function() {
     vibratopos: 0,
     vibratodepth: 1,
     vibratospeed: 1,
+    vibratotype: 0,
   });
   xm.songpats = [0];
   // 1 channel, 2 row blank pattern
diff --git a/xm.js b/xm.js
index cb9868e..6af8432 100644
--- a/xm.js
+++ b/xm.js
@@ -697,6 +697,7 @@ function load(arrayBuf) {
       vibratopos: 0,
       vibratodepth: 1,
       vibratospeed: 1,
+      vibratotype: 0,
     });
   }
   console.log("header len " + hlen);
diff --git a/xmeffects.js b/xmeffects.js
index 0e8a7f1..27d2eda 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -135,6 +135,9 @@ function eff_t0_e(ch, data) {  // extended effects!
     case 2:  // fine porta down
       ch.period += data;
       break;
+    case 4:  // set vibrato waveform
+      ch.vibratotype = data & 0x07;
+      break;
     case 5:  // finetune
       ch.fine = (data<<4) + data - 128;
       break;

From 0e47b13d833b3a7e5f826b2af59f6cea2debf28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 02:26:04 +0100
Subject: [PATCH 53/65] Implement all vibrato waveforms

---
 xmeffects.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/xmeffects.js b/xmeffects.js
index 27d2eda..dad153d 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -65,7 +65,7 @@ function eff_t0_4(ch, data) {  // vibrato
 }
 
 function eff_t1_4(ch) {  // vibrato
-  ch.periodoffset = Math.sin(ch.vibratopos * Math.PI / 32) * ch.vibratodepth;
+  ch.periodoffset = getVibratoDelta(ch.vibratotype, ch.vibratopos) * ch.vibratodepth;
   if (isNaN(ch.periodoffset)) {
     console.log("vibrato periodoffset NaN?",
         ch.vibratopos, ch.vibratospeed, ch.vibratodepth);
@@ -75,6 +75,24 @@ function eff_t1_4(ch) {  // vibrato
   ch.vibratopos &= 63;
 }
 
+function getVibratoDelta(type, x) {
+  var delta = 0;
+  switch (type & 0x03) {
+    case 1: // sawtooth (ramp-down)
+      delta = ((1 + x * 2 / 64) % 2) - 1;
+      break;
+    case 2: // square
+    case 3: // random (in FT2 these two are the same)
+      delta = x < 32 ? 1 : -1;
+      break;
+    case 0:
+    default: // sine
+      delta = Math.sin(x * Math.PI / 32);
+      break;
+  }
+  return delta;
+}
+
 function eff_t1_5(ch) {  // portamento + volume slide
   eff_t1_a(ch);
   eff_t1_3(ch);

From 5af28d860ed9cc348cafcd7dc56cf52d502ebf18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 02:26:50 +0100
Subject: [PATCH 54/65] Update vibratopos according to the spec

---
 xmeffects.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xmeffects.js b/xmeffects.js
index dad153d..7249bc7 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -71,8 +71,11 @@ function eff_t1_4(ch) {  // vibrato
         ch.vibratopos, ch.vibratospeed, ch.vibratodepth);
     ch.periodoffset = 0;
   }
-  ch.vibratopos += ch.vibratospeed;
-  ch.vibratopos &= 63;
+  // only updates on non-first ticks
+  if (player.cur_tick > 0) {
+    ch.vibratopos += ch.vibratospeed;
+    ch.vibratopos &= 63;
+  }
 }
 
 function getVibratoDelta(type, x) {

From 413bc4b5387c4ef451b70ccabc6f557d7f8d5a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 02:30:04 +0100
Subject: [PATCH 55/65] Retrigger waveforms 0-3

---
 xm.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xm.js b/xm.js
index 6af8432..9a02f5c 100644
--- a/xm.js
+++ b/xm.js
@@ -264,6 +264,10 @@ function nextRow() {
       if (ch.note) {
         ch.period = periodForNote(ch, ch.note);
       }
+      // waveforms 0-3 are retriggered on new notes while 4-7 are continuous
+      if (ch.vibratotype < 4) {
+        ch.vibratopos = 0;
+      }
     }
   }
 }

From b81d675b660262fd0c247bdf1bd24b7fe459ffc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 15:50:48 +0100
Subject: [PATCH 56/65] Test for resetting vibrato pos on note retrigger

---
 test/instrument.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/instrument.js b/test/instrument.js
index 5bf1948..433b2a4 100644
--- a/test/instrument.js
+++ b/test/instrument.js
@@ -46,10 +46,12 @@ exports['test note trigger'] = function(assert) {
   XMPlayer.nextRow();
   ch.pan = 1;  // forcibly override panning
   ch.off = 100;  // and sample offset
+  ch.vibratopos = 1; // and vibrato position
   XMPlayer.nextRow();
   assert.equal(ch.note, 49, 'note updated after inst trigger');
   assert.equal(ch.period, 1136, 'period updated after note trigger');
   assert.equal(ch.vol, 0x33, 'vol not reset after note trigger');
   assert.equal(ch.pan, 1, 'pan not reset after note trigger');
   assert.equal(ch.off, 0, 'set offset=0');
+  assert.equal(ch.vibratopos, 0, 'set vibrato pos=0');
 };

From e39f601038d75e5d4abc7b84e5422798bc0dcc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 15:50:58 +0100
Subject: [PATCH 57/65] Double vibrato depth to act like FT2

---
 xmeffects.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmeffects.js b/xmeffects.js
index 7249bc7..27e906c 100644
--- a/xmeffects.js
+++ b/xmeffects.js
@@ -56,7 +56,7 @@ function eff_t1_3(ch) {  // portamento
 
 function eff_t0_4(ch, data) {  // vibrato
   if (data & 0x0f) {
-    ch.vibratodepth = data & 0x0f;
+    ch.vibratodepth = (data & 0x0f) * 2;
   }
   if (data >> 4) {
     ch.vibratospeed = data >> 4;

From 677c157c715f7a6b1bc409de59af0e2bc5a1057a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 19:54:54 +0100
Subject: [PATCH 58/65] Fix failing vibrato test

---
 test/effects.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/effects.js b/test/effects.js
index b64f8a2..6b46303 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -85,7 +85,7 @@ exports['test 3xx portamento'] = function(assert) {
   assert.equal(ch.period, 1152 - 16, 'row 1 tick 2 period -16');
 };
 
-exports['test 4xy vibrato'] = function(assert) {
+exports['test 4xy vibrato - sine'] = function(assert) {
   var xm = testdata.resetXMData();
   // vibrato 4xy: speed x, depth y
   // full cycle is 64/speed
@@ -107,37 +107,37 @@ exports['test 4xy vibrato'] = function(assert) {
   XMPlayer.nextTick();  // row 0 tick 1
   // compute logical period p from actual play frequency
   var p = 16*12 * Math.log(p0 / ch.doff) / Math.log(2);
-  assert.equal(p.toFixed(3), "0.707", 'row 0 tick 1 period +0.707');
+  assert.equal(p.toFixed(3), "0.000", 'row 0 tick 1 period +0');
   XMPlayer.nextTick();  // row 0 tick 2
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "1.000", 'row 0 tick 2 period +1.000');
+  assert.equal(p.toFixed(3), "1.414", 'row 0 tick 2 period +1.414');
   XMPlayer.nextTick();  // row 1 tick 0
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "1.414", 'row 1 tick 0 period +1.414');
+  assert.equal(p.toFixed(3), "4.000", 'row 1 tick 0 period +4.000');
   XMPlayer.nextTick();  // row 1 tick 1
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "0.000", 'row 1 tick 1 period +0');
+  assert.equal(p.toFixed(3), "4.000", 'row 1 tick 1 period +4.000');
   XMPlayer.nextTick();  // row 1 tick 2
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.414", 'row 1 tick 2 period -1.414');
+  assert.equal(p.toFixed(3), "2.828", 'row 1 tick 2 period 2.828');
   XMPlayer.nextTick();  // row 2 tick 0
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-2.000", 'row 2 tick 0 period -2.000');
+  assert.equal(p.toFixed(3), "0.000", 'row 2 tick 0 period +0');
   XMPlayer.nextTick();  // row 2 tick 1
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.990", 'row 2 tick 1 period -1.990');
+  assert.equal(p.toFixed(3), "0.000", 'row 2 tick 1 period +0');
   XMPlayer.nextTick();  // row 2 tick 2
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.962", 'row 2 tick 2 period -1.962');
+  assert.equal(p.toFixed(3), "-0.392", 'row 2 tick 2 period -0.392');
   XMPlayer.nextTick();  // row 3 tick 0
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.914", 'row 3 tick 0 period -1.914');
+  assert.equal(p.toFixed(3), "-0.780", 'row 3 tick 0 period -0.780');
   XMPlayer.nextTick();  // row 3 tick 1
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.848", 'row 3 tick 1 period -1.848');
+  assert.equal(p.toFixed(3), "-0.780", 'row 3 tick 1 period -0.780');
   XMPlayer.nextTick();  // row 3 tick 2
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.764", 'row 3 tick 2 period -1.764');
+  assert.equal(p.toFixed(3), "-1.161", 'row 3 tick 2 period -1.161');
   XMPlayer.nextTick();  // row 4 tick 0
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
   assert.equal(p.toFixed(3), "0.000", 'row 4 tick 0 period 0 - no vibrato');
@@ -148,16 +148,16 @@ exports['test 4xy vibrato'] = function(assert) {
   // that's what I'm assuming here...
   XMPlayer.nextTick();  // row 5 tick 0
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.663", 'row 5 tick 0 period -1.663 - vibrato resume');
+  assert.equal(p.toFixed(3), "-1.531", 'row 5 tick 0 period -1.531 - vibrato resume');
   XMPlayer.nextTick();  // row 5 tick 1
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.546", 'row 5 tick 1 period -1.546');
+  assert.equal(p.toFixed(3), "-1.531", 'row 5 tick 1 period -1.531');
   XMPlayer.nextTick();  // row 5 tick 2
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.414", 'row 5 tick 2 period -1.414');
+  assert.equal(p.toFixed(3), "-1.886", 'row 5 tick 2 period -1.886');
   XMPlayer.nextTick();  // row 6 tick 0
   p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
-  assert.equal(p.toFixed(3), "-1.269", 'row 6 tick 0 period -1.269');
+  assert.equal(p.toFixed(3), "-1.111", 'row 6 tick 0 period -1.111');
 };
 
 exports['test Axy volume slide'] = function(assert) {

From 9b959532fb513f31a9fcfb3256dcdb7e056f62cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 20:19:30 +0100
Subject: [PATCH 59/65] Add tests for E4x, E41 and E42

---
 test/effects.js | 159 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)

diff --git a/test/effects.js b/test/effects.js
index 6b46303..4a84f07 100644
--- a/test/effects.js
+++ b/test/effects.js
@@ -160,6 +160,143 @@ exports['test 4xy vibrato - sine'] = function(assert) {
   assert.equal(p.toFixed(3), "-1.111", 'row 6 tick 0 period -1.111');
 };
 
+exports['test 4xy vibrato - saw'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // vibrato 4xy: speed x, depth y
+  // full cycle is 64/speed
+  xm.patterns[0] = [
+    [[48,  1, -1, 14, 0x41]],  // C-4  1 -- E41 - 1 = saw (ramp-down)
+    [[-1, -1, -1,  4, 0x81]],  // --- -- -- 481
+    [[-1, -1, -1,  4, 0x00]],  // --- -- -- 400
+    [[-1, -1, -1,  0, 0x00]],  // --- -- -- --- - no vibrato
+    [[-1, -1, -1,  4, 0x00]],  // --- -- -- 400 - resume vibrato @ pos 0
+  ];
+  XMPlayer.xm.tempo = 4;
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.vibratotype, 0, 'initial vibratotype 0');
+  XMPlayer.nextTick();  // row 0 tick 0
+  var p0 = ch.doff;
+  assert.equal(ch.vibratotype, 1, 'row 0 tick 0 vibratotype=1');
+  XMPlayer.nextTick();  // row 0 tick 1
+  XMPlayer.nextTick();  // row 0 tick 2
+  XMPlayer.nextTick();  // row 0 tick 3
+  XMPlayer.nextTick();  // row 1 tick 0
+  assert.equal(ch.periodoffset, 0, 'row 1 tick 0 periodoffset=0');
+  XMPlayer.nextTick();  // row 1 tick 1
+  // compute logical period p from actual play frequency
+  var p = 16*12 * Math.log(p0 / ch.doff) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.000", 'row 1 tick 1 period +0');
+  XMPlayer.nextTick();  // row 1 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.500", 'row 1 tick 2 period +0.500');
+  XMPlayer.nextTick();  // row 1 tick 3
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "1.000", 'row 1 tick 3 period +1.000');
+  XMPlayer.nextTick();  // row 2 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "1.500", 'row 2 tick 0 period +1.500');
+  XMPlayer.nextTick();  // row 2 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "1.500", 'row 2 tick 1 period +1.500');
+  XMPlayer.nextTick();  // row 2 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-2.000", 'row 2 tick 2 period -2.000');
+  XMPlayer.nextTick();  // row 2 tick 3
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.500", 'row 2 tick 3 period -1.500');
+  XMPlayer.nextTick();  // row 3 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.000", 'row 3 tick 0 period 0 - no vibrato');
+  XMPlayer.nextTick();  // row 3 tick 1
+  XMPlayer.nextTick();  // row 3 tick 2
+  XMPlayer.nextTick();  // row 3 tick 3
+  XMPlayer.nextTick();  // row 4 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.000", 'row 4 tick 0 period -1.000 - vibrato resume');
+  XMPlayer.nextTick();  // row 4 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-1.000", 'row 4 tick 1 period -1.000');
+  XMPlayer.nextTick();  // row 4 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-0.500", 'row 4 tick 2 period -0.500');
+  XMPlayer.nextTick();  // row 4 tick 3
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.000", 'row 4 tick 3 period +0');
+};
+
+exports['test 4xy vibrato - square'] = function(assert) {
+  var xm = testdata.resetXMData();
+  // vibrato 4xy: speed x, depth y
+  // full cycle is 64/speed
+  xm.patterns[0] = [
+    [[48,  1, -1, 14, 0x42]],  // C-4  1 -- E42 - 2 = square
+    [[-1, -1, -1,  4, 0x81]],  // --- -- -- 481
+    [[-1, -1, -1,  4, 0x02]],  // --- -- -- 402
+    [[-1, -1, -1,  4, 0x10]],  // --- -- -- 410
+    [[-1, -1, -1,  4, 0x03]],  // --- -- -- 403
+    [[-1, -1, -1,  0, 0x00]],  // --- -- -- --- - no vibrato
+    [[-1, -1, -1,  4, 0x00]],  // --- -- -- 400 - resume vibrato @ pos 0
+  ];
+  XMPlayer.xm.tempo = 3;
+  var ch = xm.channelinfo[0];
+  assert.equal(ch.vibratotype, 0, 'initial vibratotype 0');
+  XMPlayer.nextTick();  // row 0 tick 0
+  var p0 = ch.doff;
+  assert.equal(ch.vibratotype, 2, 'row 0 tick 0 vibratotype=2');
+  XMPlayer.nextTick();  // row 0 tick 1
+  XMPlayer.nextTick();  // row 0 tick 2
+  XMPlayer.nextTick();  // row 1 tick 0
+  assert.equal(ch.periodoffset, 2, 'row 1 tick 0 periodoffset=2');
+  XMPlayer.nextTick();  // row 1 tick 1
+  // compute logical period p from actual play frequency
+  var p = 16*12 * Math.log(p0 / ch.doff) / Math.log(2);
+  assert.equal(p.toFixed(3), "2.000", 'row 1 tick 1 period +2.000');
+  XMPlayer.nextTick();  // row 1 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "2.000", 'row 1 tick 2 period +2.000');
+  XMPlayer.nextTick();  // row 2 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "4.000", 'row 2 tick 0 period +4.000');
+  XMPlayer.nextTick();  // row 2 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "4.000", 'row 2 tick 1 period +4.000');
+  XMPlayer.nextTick();  // row 2 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "4.000", 'row 2 tick 2 period +4.000');
+  XMPlayer.nextTick();  // row 3 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-4.000", 'row 3 tick 0 period -4.000');
+  XMPlayer.nextTick();  // row 3 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-4.000", 'row 3 tick 1 period -4.000');
+  XMPlayer.nextTick();  // row 3 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-4.000", 'row 3 tick 2 period -4.000');
+  XMPlayer.nextTick();  // row 4 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-6.000", 'row 4 tick 0 period -6.000');
+  XMPlayer.nextTick();  // row 4 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-6.000", 'row 4 tick 1 period -6.000');
+  XMPlayer.nextTick();  // row 4 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-6.000", 'row 4 tick 2 period -6.000');
+  XMPlayer.nextTick();  // row 4 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "0.000", 'row 4 tick 0 period 0 - no vibrato');
+  XMPlayer.nextTick();  // row 4 tick 1
+  XMPlayer.nextTick();  // row 4 tick 2
+  XMPlayer.nextTick();  // row 5 tick 0
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-6.000", 'row 5 tick 0 period -6.000 - vibrato resume');
+  XMPlayer.nextTick();  // row 5 tick 1
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-6.000", 'row 5 tick 1 period -6.000');
+  XMPlayer.nextTick();  // row 5 tick 2
+  p = -16*12 * Math.log(ch.doff / p0) / Math.log(2);
+  assert.equal(p.toFixed(3), "-6.000", 'row 5 tick 2 period -6.000');
+};
+
 exports['test Axy volume slide'] = function(assert) {
   var xm = testdata.resetXMData();
   XMPlayer.xm.tempo = 6;
@@ -322,6 +459,28 @@ exports['test Hxy global volume slide'] = function(assert) {
   assert.equal(xm.global_volume, 128, 'row 3 tick 2 vol 128');
 };
 
+exports['test E4x set vibrato waveform'] = function(assert) {
+  var xm = testdata.resetXMData();
+  xm.patterns = [
+    [
+      [[48, 1, -1,  0, 0x00]], // C-4  1 -- ---  (default waveform - sine)
+      [[48, 1, -1, 14, 0x41]], // C-4  1 -- E41  (saw, ramp-down)
+      [[48, 1, -1, 14, 0x42]], // C-4  1 -- E42  (square)
+      [[48, 1, -1, 14, 0x43]]  // C-4  1 -- E43  (random)
+    ]
+  ];
+  xm.tempo = 1;
+  var ch = xm.channelinfo[0];
+  XMPlayer.nextTick();
+  assert.equal(ch.vibratotype, 0, 'row 0 tick 0 vibratotype=0');
+  XMPlayer.nextTick();
+  assert.equal(ch.vibratotype, 1, 'row 1 tick 0 vibratotype=1');
+  XMPlayer.nextTick();
+  assert.equal(ch.vibratotype, 2, 'row 2 tick 0 vibratotype=2');
+  XMPlayer.nextTick();
+  assert.equal(ch.vibratotype, 3, 'row 3 tick 0 vibratotype=3');
+};
+
 exports['test E5x finetune override'] = function(assert) {
   var xm = testdata.resetXMData();
   // set an initial finetune so we know we're overriding it...

From 1d8b91c8ead4bac993a1618cc3708cc3c00654aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 20:21:39 +0100
Subject: [PATCH 60/65] Remove E4x from missing effects

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index dff04a5..3c6535e 100644
--- a/index.html
+++ b/index.html
@@ -72,7 +72,7 @@
 code: <a href="http://github.com/a1k0n/jsxm/">github.com/a1k0n/jsxm</a>
 todo:
  - missing XM effects:
-   - E3x, E4x, E6x, E7x, E9x, EDx, EEx
+   - E3x, E6x, E7x, E9x, EDx, EEx
    - 7xy - tremolo
    - Kxx, Lxx, Pxy, Txy
  - render pattern with the wider fonts for fewer channels

From e3d159e7ff1764ed56cec448401d795c20dfa609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Hillerstr=C3=B6m?= <progr@mmer.nu>
Date: Sat, 21 Nov 2015 20:22:00 +0100
Subject: [PATCH 61/65] Add contributors to package.json

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c3e82b..e21fffb 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,10 @@
   "repository": "a1k0n/jsxm",
   "author": "Andy Sloane <andy@a1k0n.net> (http://www.a1k0n.net/)",
   "license": "MIT",
-
+  "contributors": [{
+    "name": "Johan Hillerström",
+    "email": "progr@mmer.nu"
+  }],
   "main": "index.html",
   "window": {
     "frame": true,

From 27d9435d83d8d7fb35b1e143d5b580a09533ebec Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 19 Apr 2016 16:33:21 -0700
Subject: [PATCH 62/65] [#24] Implement M0 volume effect (portamento)

Written so Mx is equivalent to 3x0; I think if both are present, it
might not do exactly what FT2 does.
---
 xm.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xm.js b/xm.js
index 9a02f5c..2752dc8 100644
--- a/xm.js
+++ b/xm.js
@@ -215,6 +215,11 @@ function nextRow() {
         player.effects_t1[4](ch);  // and also call it on tick 0
       } else if (v >= 0xc0 && v < 0xd0) {  // set panning
         ch.pan = (v & 0x0f) * 0x11;
+      } else if (v >= 0xf0 && v <= 0xff) {  // portamento
+        if (v & 0x0f) {
+          ch.portaspeed = (v & 0x0f) << 4;
+        }
+        ch.voleffectfn = player.effects_t1[3];  // just run 3x0
       } else {
         console.log("channel", i, "volume effect", v.toString(16));
       }
@@ -233,7 +238,7 @@ function nextRow() {
     }
 
     // special handling for portamentos: don't trigger the note
-    if (ch.effect == 3 || ch.effect == 5) {
+    if (ch.effect == 3 || ch.effect == 5 || r[i][2] >= 0xf0) {
       if (r[i][0] != -1) {
         ch.periodtarget = periodForNote(ch, ch.note);
       }

From ea423577f0bd90e04ba626ac21cd0fa607388807 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Fri, 22 Apr 2016 12:11:56 -0700
Subject: [PATCH 63/65] [#4] Re-enable iOS hack

Before it was running a 1Hz oscillator for 10ms which caused a huge DC
offset when it was done.. Turns out it works if you just immediately
stop and disconnect it, without causing DC offsets or other problems.
---
 xm.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/xm.js b/xm.js
index 2752dc8..49c00da 100644
--- a/xm.js
+++ b/xm.js
@@ -932,17 +932,12 @@ function play() {
     jsNode.connect(gainNode);
 
     // hack to get iOS to play anything
-    /*
-     * this seems to cause other player issues... disabling for now
     var temp_osc = player.audioctx.createOscillator();
     temp_osc.connect(player.audioctx.destination);
     if (temp_osc.noteOn) temp_osc.start = temp_osc.noteOn;
-    temp_osc.frequency.value = 1;
     temp_osc.start(0);
-    setTimeout(10, function() {
-      temp_osc.disconnect();
-    });
-    */
+    temp_osc.stop();
+    temp_osc.disconnect();
   }
   player.playing = true;
 }

From f6113fc6c4b19cf95b4f3ccd0f7278905f7a3077 Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 31 May 2016 18:52:33 -0700
Subject: [PATCH 64/65] simple optimization to filter

just basic algebra, but I should have noticed this sooner!
---
 xm.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xm.js b/xm.js
index 49c00da..e29bfb5 100644
--- a/xm.js
+++ b/xm.js
@@ -90,8 +90,8 @@ function filterCoeffs(f_c) {
   var e = Math.exp(-wct);
   var c = e * Math.cos(wct);
   var s = e * Math.sin(wct);
-  var gain = (1 - 2*c + c*c + s*s) / 2;
-  return [gain, 2*c, -c*c - s*s];
+  var gain = (1 - 2*c + e*e) / 2;
+  return [gain, 2*c, -e*e];
 }
 
 function updateChannelPeriod(ch, period) {

From 219479ecc6d011dcf6d9e279584bae70b3fecd4c Mon Sep 17 00:00:00 2001
From: Andy Sloane <andy@a1k0n.net>
Date: Tue, 31 May 2016 22:15:46 -0700
Subject: [PATCH 65/65] addendum to previous commit; duh

---
 xm.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xm.js b/xm.js
index e29bfb5..5f815b5 100644
--- a/xm.js
+++ b/xm.js
@@ -89,7 +89,6 @@ function filterCoeffs(f_c) {
   var wct = Math.sqrt(2) * Math.PI * f_c;
   var e = Math.exp(-wct);
   var c = e * Math.cos(wct);
-  var s = e * Math.sin(wct);
   var gain = (1 - 2*c + e*e) / 2;
   return [gain, 2*c, -e*e];
 }