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

Merge branch 'master' of https://github.com/mudcube/MIDI.js 

Conflicts:
	inc/jasmid/replayer.js
master
Michael Deal 2013-02-19 12:22:28 -08:00
parent 7b12856d9d dac4757e1e
commit b8e0cca45e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
inc/jasmid/replayer.js
View File

@ -68,15 +68,15 @@ function Replayer(midiFile, timeWarp, eventProcessor) {
var midiEvent;
var temporal = [];
//
function processEvents() {
function processNext() {
// respect Tempo Event - Mani
if (midiEvent.event.type == "meta" && midiEvent.event.subtype == "setTempo" ) {
function processEvents() {
function processNext() {
if ( midiEvent.event.type == "meta" && midiEvent.event.subtype == "setTempo" ) {
// tempo change events can occur anywhere in the middle and affect events that follow
beatsPerMinute = 60000000 / midiEvent.event.microsecondsPerBeat;
}
if (midiEvent.ticksToEvent > 0) {
var beatsToGenerate = midiEvent.ticksToEvent / ticksPerBeat;
var secondsToGenerate = beatsToGenerate / (beatsPerMinute / 60);
}
if (midiEvent.ticksToEvent > 0) {
var beatsToGenerate = midiEvent.ticksToEvent / ticksPerBeat;
var secondsToGenerate = beatsToGenerate / (beatsPerMinute / 60);
}
var time = (secondsToGenerate * 1000 * timeWarp) || 0;
temporal.push([ midiEvent, time]);
@ -93,4 +93,4 @@ function Replayer(midiFile, timeWarp, eventProcessor) {
return clone(temporal);
}
};
};
};