seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2013-09-26 14:07:27 +00:00
parent cf907cc060 b5cd965089
commit f9f012cdc8
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/assets/javascripts/fakeJamClient.js
View File

@ -277,6 +277,9 @@
_mix = level;
}
function SessionSetUserName(client_id,name){
}
function doCallbacks() {
var names = ["left_vu", "right_vu"];

1
web/app/assets/javascripts/session.js
View File

@ -416,6 +416,7 @@
trackData.gainPercent = gainPercent;
trackData.muteClass = muteClass;
trackData.mixerId = mixer.id;
context.jamClient.SessionSetUserName(participant.client_id,name);
} else { // No mixer to match, yet
lookingForMixers[track.id] = participant.client_id;
if (!(lookingForMixersTimer)) {