Skip to content

Commit

Permalink
remove tracks and room source for now
Browse files Browse the repository at this point in the history
  • Loading branch information
clkao committed Apr 17, 2020
1 parent 7f0e16a commit c2889ef
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
16 changes: 8 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="//jitsi.jothon.online/libs/lib-jitsi-meet.min.js"></script>
<script src="common.js"></script>
<script src="logic-grid.js"></script>
<script src="common.js?"></script>
<script src="logic-grid.js?"></script>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.css">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<style>
Expand Down Expand Up @@ -532,19 +532,19 @@
room.setLocalParticipantProperty('character', $('#character').val());
room.setLocalParticipantProperty('top', parseInt(Game.heroes.me.y));
room.setLocalParticipantProperty('left', parseInt(Game.heroes.me.x));
room.on(JitsiMeetJS.events.conference.TRACK_ADDED, onRemoteTrack);
room.on(JitsiMeetJS.events.conference.TRACK_REMOVED, track => {
console.log(`track removed!!!${track}`);
});
// room.on(JitsiMeetJS.events.conference.TRACK_ADDED, onRemoteTrack);
// room.on(JitsiMeetJS.events.conference.TRACK_REMOVED, track => {
// console.log(`track removed!!!${track}`);
// });

room.on(
JitsiMeetJS.events.conference.CONFERENCE_JOINED,
onConferenceJoined);

room.join();

JitsiMeetJS.createLocalTracks({ devices: [ 'audio' ] })
.then(onLocalTracks);
// JitsiMeetJS.createLocalTracks({ devices: [ 'audio' ] })
// .then(onLocalTracks);
};

function disconnect() {
Expand Down
7 changes: 4 additions & 3 deletions logic-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ return null;
};

var loadRoomData = function(room_name){
/*
$.ajax({
url: api_url + 'rpg/getroom?room=' + encodeURIComponent(room_name),
success: function(ret){
Expand Down Expand Up @@ -63,13 +64,13 @@ var loadRoomData = function(room_name){
$('#object-count').text(ret.data.objects.length).data(ret.data.objects);
calculateWallLayer();
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
error: function(XMLHttpRequest, textStatus, errorThrown) {*/
$.get('room.json', function(room) {
map.layers = room;
calculateWallLayer();
}, 'json');
}
});
/* }
});*/
};
loadRoomData('chat2d');

Expand Down

0 comments on commit c2889ef

Please sign in to comment.