seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

*wip

This commit is contained in:
Seth Call 2014-11-12 08:46:21 -06:00
parent 27800d17fd
commit 26ec97f7af
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,9 +703,9 @@
context.JK.FaderHelpers.renderFader($voiceChatGain, faderOpts);
$voiceChatGain.on('fader_change', faderChanged);
context.JK.FaderHelpers.setFaderValue(mixer.id, gainPercent);
if (mixer.mute) {
_toggleVisualMuteControl($voiceChatMute, true);
}
//if (mixer.mute) {
_toggleVisualMuteControl($voiceChatMute, mixer, null);
//}
}
});
}
@ -872,15 +872,15 @@
var oppositeMixer = null;
if(mixers) {
if(mixers[ChannelGroupIds.AudioInputMusicGroup]) {
mixer = [ChannelGroupIds.AudioInputMusicGroup][0]
mixer = mixers[ChannelGroupIds.AudioInputMusicGroup][0]
}
else if(sessionModel.isMasterMixMode() && mixers[ChannelGroupIds.PeerAudioInputMusicGroup]) {
mixer = [ChannelGroupIds.PeerAudioInputMusicGroup][0]
oppositeMixer = [ChannelGroupIds.UserMusicInputGroup][0]
mixer = mixers[ChannelGroupIds.PeerAudioInputMusicGroup][0]
oppositeMixer = mixers[ChannelGroupIds.UserMusicInputGroup][0]
}
else if(!sessionModel.isMasterMixMode() && mixers[ChannelGroupIds.UserMusicInputGroup]) {
mixer = [ChannelGroupIds.UserMusicInputGroup][0]
oppositeMixer = [ChannelGroupIds.PeerAudioInputMusicGroup][0]
mixer = mixers[ChannelGroupIds.UserMusicInputGroup][0]
oppositeMixer = mixers[ChannelGroupIds.PeerAudioInputMusicGroup][0]
}
}
if (mixer) {
@ -957,20 +957,27 @@
var keysToDelete = [];
for (var key in lookingForMixers) {
var clientId = lookingForMixers[key];
var mixer = null;
var mixers = _groupedMixersForClientId(
clientId,
[
ChannelGroupIds.AudioInputMusicGroup,
ChannelGroupIds.PeerAudioInputMusicGroup,
ChannelGroupIds.UserMusicInputGroup
],
usedMixers);
var mixer = null;
var oppositeMixer = null;
if(mixers) {
if(mixers[ChannelGroupIds.AudioInputMusicGroup]) {
mixer = [ChannelGroupIds.AudioInputMusicGroup][0]
mixer = mixers[ChannelGroupIds.AudioInputMusicGroup][0]
}
else if(sessionModel.isMasterMixMode() && mixers[ChannelGroupIds.PeerAudioInputMusicGroup]) {
mixer = [ChannelGroupIds.PeerAudioInputMusicGroup][0]
oppositeMixer = [ChannelGroupIds.UserMusicInputGroup][0]
mixer = mixers[ChannelGroupIds.PeerAudioInputMusicGroup][0]
oppositeMixer = mixers[ChannelGroupIds.UserMusicInputGroup][0]
}
else if(!sessionModel.isMasterMixMode() && mixers[ChannelGroupIds.UserMusicInputGroup]) {
mixer = [ChannelGroupIds.UserMusicInputGroup][0]
oppositeMixer = [ChannelGroupIds.PeerAudioInputMusicGroup][0]
mixer = mixers[ChannelGroupIds.UserMusicInputGroup][0]
oppositeMixer = mixers[ChannelGroupIds.PeerAudioInputMusicGroup][0]
}
}
if (mixer) {
@ -989,7 +996,7 @@
$('.disabled-track-overlay', $track).hide();
$('.track-connection', $track).removeClass('red yellow green').addClass('grey');
// Set mute state
_toggleVisualMuteControl($track.find('.track-icon-mute'), mixer.mute, oppositeMixer.mute);
_toggleVisualMuteControl($track.find('.track-icon-mute'), mixer, oppositeMixer);
}
else {
// if 1 second has gone by and still no mixer, then we gray the participant's tracks
@ -1129,8 +1136,8 @@
// TODO: Use mixer's range
var faderValue = percentFromMixerValue(-80, 20, value);
context.JK.FaderHelpers.setFaderValue(mixerId, faderValue);
var $muteControl = $('[control="mute"][mixer-id="' + mixerId + '"]');
_toggleVisualMuteControl($muteControl, isMuted);
//var $muteControl = $('[control="mute"][mixer-id="' + mixerId + '"]');
//_toggleVisualMuteControl($muteControl, isMuted);
}
function handleBridgeCallback() {
@ -1211,8 +1218,8 @@
sessionModel.deleteTrack(sessionId, trackId);
}
function _toggleVisualMuteControl($control, muting) {
if (muting) {
function _toggleVisualMuteControl($control, currentMixer, oppositeMixer) {
if (currentMixer.mute) {
$control.removeClass('enabled');
$control.addClass('muted');
} else {