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

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

Browse source 
Conflicts:
	inc/jasmid/replayer.js
This commit is contained in:
Michael Deal 2013-02-19 12:22:28 -08:00
commit b8e0cca45e
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inc/jasmid/replayer.js
View file

@ -70,8 +70,8 @@ function Replayer(midiFile, timeWarp, eventProcessor) {
// //
function processEvents() { function processEvents() {
function processNext() { function processNext() {
// respect Tempo Event - Mani
if ( midiEvent.event.type == "meta" && midiEvent.event.subtype == "setTempo" ) { 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; beatsPerMinute = 60000000 / midiEvent.event.microsecondsPerBeat;
} }
if (midiEvent.ticksToEvent > 0) { if (midiEvent.ticksToEvent > 0) {