seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions 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-17 15:03:23 +00:00
parent 1e39eb7037 0dfd122316
commit 1c4a4f2d76
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/app/assets/javascripts/configureTrack.js
View File

@ -657,17 +657,27 @@
logger.debug("Calling TrackSetChatEnable with value = " + voiceChatType);
context.jamClient.TrackSetChatEnable(voiceChatType == VOICE_CHAT.CHAT ? true : false);
// UNASSIGNED VOICE CHAT
$('#voice-inputs-unused > option').each(function() {
logger.debug("Marking " + this.value + " as unassigned voice input.");
context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.UNASSIGNED);
});
if (voiceChatType == VOICE_CHAT.CHAT) {
// UNASSIGNED VOICE CHAT
$('#voice-inputs-unused > option').each(function() {
logger.debug("Marking " + this.value + " as unassigned voice input.");
context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.UNASSIGNED);
});
// VOICE CHAT INPUT
$("#voice-inputs-selection > option").each(function() {
logger.debug("Saving chat input = " + this.value);
context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.CHAT);
});
// VOICE CHAT INPUT
$("#voice-inputs-selection > option").each(function() {
logger.debug("Saving chat input = " + this.value);
context.jamClient.TrackSetAssignment(this.value, true, ASSIGNMENT.CHAT);
});
}
// make sure any previously assigned chat devices are marked as unassigned
else if (voiceChatType == VOICE_CHAT.NO_CHAT) {
// chat devices that were assigned
$.each(chatOtherAssignedList, function(index, val) {
logger.debug("Marking " + val.id + " as unassigned voice input.");
context.jamClient.TrackSetAssignment(val.id, true, ASSIGNMENT.UNASSIGNED);
});
}
}
function cancelSettings() {