Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed runtime errors

This commit is contained in:
manuroe 2014-10-19 09:08:27 +02:00
parent 4f58d41c15
commit 453a4f8f8b
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
webclient/components/matrix/midi-event-handler.js
View File

@ -88,11 +88,12 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
getLogDuration: function(duration) { getLogDuration: function(duration) {
var fraction = duration / this.beat; var fraction = duration / this.beat;
console.log(fraction); console.log(fraction);
var musicFraction;
var duration = Math.floor(Math.log2(1 / fraction)) - 1; return Math.floor(Math.log2(1 / fraction)) - 1;
}, },
renderChord: function(duration, rest) { renderChord: function(duration, rest) {
var musicFraction;
var logDuration = this.getLogDuration(duration); var logDuration = this.getLogDuration(duration);
var trashIt = false; // Flag to ignore artefact(???) var trashIt = false; // Flag to ignore artefact(???)
switch (logDuration) { switch (logDuration) {
@ -119,13 +120,10 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
// Too short, ignore it // Too short, ignore it
trashIt = true; trashIt = true;
break; break;
}
// Matthew is about to fix it
if (trashIt) return;
} }
this.currentMeasureTime += duration;
// Matthew is about to fix it
if (trashIt) return;
var s = ":" + musicFraction + " "; var s = ":" + musicFraction + " ";
@ -134,22 +132,22 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
} }
else { else {
var notes = []; var notes = [];
for (var note in chord.notes) { for (var note in this.chord.notes) {
if (chord.notes.hasOwnProperty(note)) { if (this.chord.notes.hasOwnProperty(note)) {
notes.push(note); notes.push(note);
} }
} }
if (notes.length > 1) { if (notes.length > 1) {
s += "("; s += "(";
for (int i = 0; i < notes.length; i++) { for (var i = 0; i < notes.length; i++) {
s += notes[i]; s += notes[i];
if (i < notes.length - 1) s+= "."; if (i < notes.length - 1) s+= ".";
} }
s += ")"; s += ")";
} }
else { else {
s += vexNote; s += notes[0];
} }
} }
@ -190,7 +188,7 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
if (event.content.midi_ts - this.chord.start_midi_ts < 300) { // empirically if (event.content.midi_ts - this.chord.start_midi_ts < 300) { // empirically
// just add it to the current chord we're building up. // just add it to the current chord we're building up.
this.chord.note[vexNote]++; this.chord.notes[vexNote]++;
} }
else { else {
// render the last note/chord // render the last note/chord
@ -203,7 +201,8 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
} }
// start a new chord // start a new chord
this.chord.notes = { vexNote }; this.chord.notes = {};
this.chord.notes[vexNote]++;
this.chord.start_midi_ts = midi_ts; this.chord.start_midi_ts = midi_ts;
this.chord.end_midi_ts = 0; this.chord.end_midi_ts = 0;
} }