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

Room with music tab

This commit is contained in:
manuroe 2014-10-19 08:01:33 +02:00
parent e9abbe89f3
commit e15a168152
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webclient/components/matrix/event-handler-service.js
View File

@ -440,7 +440,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
// will be available (as opposite to the global /initialSync done at startup)
if (!isStateEvent) { // Do not consider state events
if (event.event_id && eventMap[event.event_id]) {
console.log("discarding duplicate event: " + JSON.stringify(event, undefined, 4));
//console.log("discarding duplicate event: " + JSON.stringify(event, undefined, 4));
return;
}
else {
@ -481,6 +481,15 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
case 'm.room.topic':
handleRoomTopic(event, isLiveEvent, isStateEvent);
break;
case 'org.matrix.midi':
//if (isLiveEvent)
{
MidiEventHandler.handleEvent(event);
}
break;
default:
console.log("Unable to handle event type " + event.type);
console.log(JSON.stringify(event, undefined, 4));

11
webclient/index.html
View File

@ -42,6 +42,17 @@
<script src="components/fileInput/file-input-directive.js"></script>
<script src="components/fileUpload/file-upload-service.js"></script>
<script src="components/utilities/utilities-service.js"></script>
<script type='text/javascript' src='js/MIDI.js'></script>
<script src="components/matrix/midi-event-handler.js"></script>
<script src="./inc/Base64.js" type="text/javascript"></script>
<script src="./inc/base64binary.js" type="text/javascript"></script>
<script type='text/javascript' src='js/vextab/underscore-min.js'></script>
<script type='text/javascript' src='js/vextab/vexflow-debug.js'></script>
<script type='text/javascript' src='js/vextab/tabdiv-debug.js'></script>
<script type='text/javascript' src='js/vextab/vextab_parser.js'></script>
</head>
<body>

5
webclient/room/room-controller.js
View File

@ -650,6 +650,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
$scope.onInit = function() {
console.log("onInit");
MidiEventHandler.reset();
// Does the room ID provided in the URL?
var room_id_or_alias;
if ($routeParams.room_id_or_alias) {
@ -814,6 +817,8 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
// There are already messages, go to the last message
scrollToBottom(true);
}
MidiEventHandler.setReady();
},
function(error) {
$scope.feedback = "Failed get member list: " + error.data.error;

3
webclient/room/room.html
View File

@ -68,6 +68,9 @@
ng-hide="state.permission_denied"
ng-style="{ 'visibility': state.messages_visibility }"
keep-scroll>
<canvas id="boo" style="width:95%;"></canvas>
<table id="messageTable" infinite-scroll="paginateMore()">
<tr ng-repeat="msg in events.rooms[room_id].messages"
ng-class="(events.rooms[room_id].messages[$index + 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item>