Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue with skipping first note, progress counter not starting until 2nd note played, and added end of song callback #227

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed issue with skipping first note, progress counter not starting until 2nd note played, and added end of song callback #227

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c28d720
overdue fixes
silverhawk184 Jan 1, 2018
2fe8b29
fixed auto looping and add end of track callback
silverhawk184 Jan 1, 2018
069bf82
Fix position indicator on resume from pause
silverhawk184 Jan 13, 2018
242b20f
Event in callback was off by an octave
silverhawk184 Jan 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions js/midi/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
----------------------------------------------------------
MIDI.Player : 0.3.1 : 2015-03-26
MIDI.Player : 0.3.3 : 2018-01-28
----------------------------------------------------------
https://github.com/mudcube/MIDI.js
----------------------------------------------------------
Expand All @@ -19,11 +19,13 @@ midi.playing = false;
midi.timeWarp = 1;
midi.startDelay = 0;
midi.BPM = 120;

midi.playingStartTime = 0;
midi.ctxStartTime = 0;
midi.lastCallbackTime = 0;
midi.start =
midi.resume = function(onsuccess) {
if (midi.currentTime < -1) {
midi.currentTime = -1;
if (midi.currentTime < 0) {
midi.currentTime = 0;
}
startAudio(midi.currentTime, null, onsuccess);
};
Expand Down Expand Up @@ -80,15 +82,15 @@ midi.setAnimation = function(callback) {
}
} else { // paused
currentTime = midi.currentTime;
tOurTime = Date.now();
tTheirTime = midi.currentTime;
}
///
if(currentTime == 0 && midi.playing) currentTime = ((Date.now() - midi.ctxStartTime * 10) - midi.playingStartTime) / 100 * MIDI.Player.BPM;
var endTime = midi.endTime;
var percent = currentTime / endTime;
var total = currentTime / 1000;
var minutes = total / 60;
var seconds = total - (minutes * 60);
var t1 = minutes * 60 + seconds;
var t2 = (endTime / 1000);
//var percent = currentTime / endTime;
var t1 = currentTime / 1000;
var t2 = endTime / 1000;
///
if (t2 - t1 < -1.0) {
return;
Expand All @@ -99,6 +101,12 @@ midi.setAnimation = function(callback) {
events: noteRegistrar
});
}
midi.lastCallbackTime = currentTime;

if(currentTime > endTime){
stopAudio();
if(typeof midi.onEnd != 'undefined') midi.onEnd();
}
};
///
requestAnimationFrame(frame);
Expand Down Expand Up @@ -194,6 +202,7 @@ var startTime = 0; // to measure time elapse
var noteRegistrar = {}; // get event for requested note
var onMidiEvent = undefined; // listener
var scheduleTracking = function(channel, note, currentTime, offset, message, velocity, time) {
note -= 12; // off by one octave ???
return setTimeout(function() {
var data = {
channel: channel,
Expand Down Expand Up @@ -285,13 +294,16 @@ var startAudio = function(currentTime, fromCache, onsuccess) {
ctx.currentTime = (now - __now) / 1000;
}
///
startTime = ctx.currentTime;
midi.ctxStartTime = startTime = ctx.currentTime;
midi.playingStartTime = Date.now() - midi.ctxStartTime*10 ;
///
for (var n = 0; n < length && messages < 100; n++) {
var obj = data[n];
if ((queuedTime += obj[1]) <= currentTime) {
offset = queuedTime;
continue;

if (currentTime>0 || obj[0].event.type !== 'channel')
continue;
}
///
currentTime = queuedTime - offset;
Expand Down