diff --git a/AudioTest.html b/AudioTest.html index eeeed0b..7fe5a40 100644 --- a/AudioTest.html +++ b/AudioTest.html @@ -5,7 +5,6 @@ - @@ -15,13 +14,11 @@ \ No newline at end of file diff --git a/js/MIDI/Player.js b/js/MIDI/Player.js index f003e26..6353ee4 100644 --- a/js/MIDI/Player.js +++ b/js/MIDI/Player.js @@ -1,11 +1,11 @@ /* - + ------------------------------------- MIDI.Player : 0.3 ------------------------------------- https://github.com/mudcube/MIDI.js ------------------------------------- - requires jasmid - + #jasmid + ------------------------------------- */ if (typeof (MIDI) === "undefined") var MIDI = {}; diff --git a/js/MIDI/Plugin.js b/js/MIDI/Plugin.js index 1076d40..20deca5 100644 --- a/js/MIDI/Plugin.js +++ b/js/MIDI/Plugin.js @@ -2,7 +2,7 @@ -------------------------------------------- MIDI.Plugin : 0.3 : 11/20/2012 -------------------------------------------- - https://github.com/mudx/MIDI.js + https://github.com/mudcube/MIDI.js -------------------------------------------- MIDI.WebAudioAPI MIDI.Flash @@ -14,7 +14,7 @@ -------------------------------------------- setMute? getInstruments? - + ------------------------------------- */ if (typeof (MIDI) === "undefined") var MIDI = {}; @@ -49,8 +49,8 @@ if (window.AudioContext || window.webkitAudioContext) (function () { ctx.decodeAudioData(buffer, function (buffer) { var msg = url; while (msg.length < 3) msg += " "; - if (typeof (loader) !== "undefined") { - loader.message(synth.instrument + "
Processing: " + (index / 87 * 100 >> 0) + "%
" + msg); + if (typeof (MIDI.loader) !== "undefined") { + MIDI.loader.update(null, synth.instrument + "
Processing: " + (index / 87 * 100 >> 0) + "%
" + msg); } buffer.id = url; bufferList[index] = buffer; @@ -330,7 +330,7 @@ if (window.Audio) (function () { var instrumentId = synth.number; notes[instrumentId+""+id] = soundManager.createSound({ id: id, - url: "./soundfont/"+instrument+"-mp3/" + id + ".mp3", + url: MIDI.soundfontUrl + instrument + "-mp3/" + id + ".mp3", multiShot: true, autoLoad: true, onload: onload @@ -340,8 +340,8 @@ if (window.Audio) (function () { var loaded = []; var onload = function () { loaded.push(this.sID); - if (typeof (loader) === "undefined") return; - loader.message("Processing: " + this.sID); + if (typeof (MIDI.loader) === "undefined") return; + MIDI.loader.update(null, "Processing: " + this.sID); }; for (var i = 0; i < 88; i++) { var id = noteReverse[i + 21]; diff --git a/js/MIDI/audioDetect.js b/js/MIDI/audioDetect.js index 0dfaafb..da24e0e 100644 --- a/js/MIDI/audioDetect.js +++ b/js/MIDI/audioDetect.js @@ -1,13 +1,13 @@ /* - + ------------------------------------- MIDI.audioDetect : 0.3 ------------------------------------- - https://github.com/mudx/MIDI.js + https://github.com/mudcube/MIDI.js ------------------------------------- Probably, Maybe, No... Absolutely! ------------------------------------- Test to see what types of