deac/MIDI.js
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes #18, keep track of which instrument/note pair is playing on each audiotag 'channel', then on noteOff/chordOff find the right audiotag 'channel' to pause().

Browse source
This commit is contained in:
Brian Stoner 2013-03-12 16:00:29 -04:00
parent a5edc8ae9a
commit 6462f82fde
1 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
js/MIDI/Plugin.js
View file

@ -264,6 +264,7 @@ if (window.Audio) (function () {
var volume = 127; // floating point var volume = 127; // floating point
var channel_nid = -1; // current channel var channel_nid = -1; // current channel
var channels = []; // the audio channels var channels = []; // the audio channels
var channelInstrumentNoteIds = []; // instrumentId + noteId that is currently playing in each 'channel', for routing noteOff/chordOff calls
var notes = {}; // the piano keys var notes = {}; // the piano keys
for (var nid = 0; nid < 12; nid++) { for (var nid = 0; nid < 12; nid++) {
channels[nid] = new Audio(); channels[nid] = new Audio();
@ -272,18 +273,35 @@ if (window.Audio) (function () {
var playChannel = function (channel, note) { var playChannel = function (channel, note) {
if (!MIDI.channels[channel]) return; if (!MIDI.channels[channel]) return;
var instrument = MIDI.channels[channel].instrument; var instrument = MIDI.channels[channel].instrument;
var id = MIDI.GeneralMIDI.byId[instrument].id; var instrumentId = MIDI.GeneralMIDI.byId[instrument].id;
var note = notes[note]; var note = notes[note];
if (!note) return; if (!note) return;
var instrumentNoteId = instrumentId + "" + note.id;
var nid = (channel_nid + 1) % channels.length; var nid = (channel_nid + 1) % channels.length;
var time = (new Date()).getTime();
var audio = channels[nid]; var audio = channels[nid];
audio.src = MIDI.Soundfont[id][note.id]; channelInstrumentNoteIds[ nid ] = instrumentNoteId;
audio.src = MIDI.Soundfont[instrumentId][note.id];
audio.volume = volume / 127; audio.volume = volume / 127;
audio.play(); audio.play();
channel_nid = nid; channel_nid = nid;
}; };
var stopChannel = function (channel, note) {
if (!MIDI.channels[channel]) return;
var instrument = MIDI.channels[channel].instrument;
var instrumentId = MIDI.GeneralMIDI.byId[instrument].id;
var note = notes[note];
if (!note) return;
var instrumentNoteId = instrumentId + "" + note.id;
for(var i=0;i<channelInstrumentNoteIds.length;i++){
var cId = channelInstrumentNoteIds[i];
if(cId && cId == instrumentNoteId){
channels[i].pause();
}
}
};
root.programChange = function (channel, program) { root.programChange = function (channel, program) {
MIDI.channels[channel].instrument = program; MIDI.channels[channel].instrument = program;
}; };
@ -305,9 +323,15 @@ if (window.Audio) (function () {
}; };
root.noteOff = function (channel, note, delay) { root.noteOff = function (channel, note, delay) {
setTimeout(function() { var id = note2id[note];
channels[channel].pause(); if (!notes[id]) return;
}, delay * 1000) if (delay) {
return setTimeout(function() {
stopChannel(channel, id);
}, delay * 1000)
} else {
stopChannel(channel, id);
}
}; };
root.chordOn = function (channel, chord, velocity, delay) { root.chordOn = function (channel, chord, velocity, delay) {
@ -332,10 +356,10 @@ if (window.Audio) (function () {
if (!notes[id]) continue; if (!notes[id]) continue;
if (delay) { if (delay) {
return window.setTimeout(function () { return window.setTimeout(function () {
channels[channel].pause(); stopChannel(channel, id);
}, delay * 1000); }, delay * 1000);
} else { } else {
channels[channel].pause(); stopChannel(channel, id);
} }
} }
}; };
@ -347,7 +371,6 @@ if (window.Audio) (function () {
}; };
root.connect = function (conf) { root.connect = function (conf) {
var loading = {};
for (var key in MIDI.keyToNote) { for (var key in MIDI.keyToNote) {
note2id[MIDI.keyToNote[key]] = key; note2id[MIDI.keyToNote[key]] = key;
notes[key] = { notes[key] = {