mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-22 01:25:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Go on with hacking midi: load all messages for all rooms. So that, we have the full midi partition with the notes for computing the tempo.

Browse source
This commit is contained in:
manuroe 2014-10-19 08:44:03 +02:00
parent e09dd47f4d
commit bc9350dbb5
4 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webclient/components/matrix/event-handler-service.js
View file

@ -483,10 +483,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
break;
case 'org.matrix.midi':
//if (isLiveEvent)
{
MidiEventHandler.handleEvent(event);
}
MidiEventHandler.handleEvent(event, isLiveEvent);
break;

2
webclient/components/matrix/event-stream-service.js
View file

@ -107,7 +107,7 @@ angular.module('eventStreamService', [])
// Initial sync: get all information and the last 30 messages of all rooms of the user
// 30 messages should be enough to display a full page of messages in a room
// without requiring to make an additional request
matrixService.initialSync(30, false).then(
matrixService.initialSync(10000, false).then(
function(response) {
var rooms = response.data.rooms;
for (var i = 0; i < rooms.length; ++i) {

50
webclient/components/matrix/midi-event-handler.js
View file

@ -28,22 +28,20 @@ var MidiEventHandler = {
currentMeasureTime: 0,
perLine: -1,
init: function () {
MIDI.loadPlugin({
soundfontUrl: "./soundfont/",
instrument: "acoustic_grand_piano",
callback: function () {
/*
var delay = 0; // play one note every quarter second
var note = 50; // the MIDI note
var velocity = 127; // how hard the note hits
// play the note
MIDI.setVolume(0, 127);
MIDI.noteOn(0, note, velocity, delay);
MIDI.noteOff(0, note, delay + 0.75);
*/
pastMidiEventsInWrongOrder: [],
init: function (eventHandlerService) {
// During initialSync, handleEvent is called for each event from latest events to the past.
// Need to reorder them.
var self = this;
eventHandlerService.waitForInitialSyncCompletion().then(
function() {
for (var i = self.pastMidiEventsInWrongOrder.length - 1; i >= 0; i--) {
self.handleEvent(self.pastMidiEventsInWrongOrder[i], true);
}
}
});
);
},
reset: function() {
@ -81,7 +79,12 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
this.render();
},
handleEvent: function(event) {
handleEvent: function(event, isLiveEvent) {
if(!isLiveEvent) {
this.pastMidiEventsInWrongOrder.push(event);
return;
}
if (0 === this.beat)
{
@ -120,8 +123,10 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
var musicFraction;
// Flag to ignore artefact(???)
var trashIt = false;
var duration = Math.floor(Math.log2(1 / fraction)) - 1;
var duration = Math.floor(Math.log2(1 / fraction)) - 1;
switch (duration) {
case 4:
musicFraction = "w";
@ -141,8 +146,19 @@ notes C-D-E/4 #0# =:: C-D-E-F/4 =|=");
case -2:
musicFraction = "32";
break;
default :
console.log("## Ignored note");
// Too short, ignore it
trashIt = true;
break;
}
// Matthew is about to fix it
if (trashIt) return;
this.currentMeasureTime += duration;

1
webclient/room/room-controller.js
View file

@ -650,6 +650,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
$scope.onInit = function() {
console.log("onInit");
MidiEventHandler.init(eventHandlerService);
MidiEventHandler.reset();