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

Switch to the peer audio input group for remote members

This commit is contained in:
Jonathon Wilson 2013-08-22 21:20:07 -06:00
parent a4c8408e65
commit 6dac196858
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/session.js
View File

@ -87,7 +87,7 @@
function alertCallback(type, text) {
setTimeout(function() {
context.setTimeout(function() {
app.notify({
"title": alert_type[type].title,
"text": text,
@ -197,6 +197,8 @@
mixers.push(l2m_mixer);
}
// TODO FIXME - This needs to support multiple tracks for an individual
// client id and group.
function _mixerForClientId(clientId, groupIds) {
var foundMixer = null;
$.each(mixers, function(index, mixer) {
@ -349,11 +351,16 @@
mixerId: ""
};
// This is the likely cause of multi-track problems.
// This should really become _mixersForClientId and return a list.
// With multiple tracks, there will be more than one mixer for a
// particular client, in a particular group, and I'll need to further
// identify by track id or something similar.
var mixer = _mixerForClientId(
participant.client_id,
[
ChannelGroupIds.AudioInputMusicGroup,
ChannelGroupIds.UserMusicInputGroup
ChannelGroupIds.PeerAudioInputMusicGroup
]);
if (mixer) {
myTrack = (mixer.group_id === ChannelGroupIds.AudioInputMusicGroup);
@ -378,7 +385,6 @@
// Show settings icons only for my tracks
if (myTrack) {
$('div[mixer-id="' + mixer.id + '"].track-icon-settings').show();
console.log("Adding myTrack " + trackData.trackId);
myTracks.push(trackData);
}
// TODO: UNCOMMENT THIS WHEN TESTING LOCALLY IN BROWSER
@ -419,10 +425,9 @@
key,
[
ChannelGroupIds.AudioInputMusicGroup,
ChannelGroupIds.UserMusicInputGroup
ChannelGroupIds.PeerAudioInputMusicGroup
]);
if (mixer) {
var vuOpts = $.extend({}, trackVuOpts);
var faderOpts = $.extend({}, trackFaderOpts);
faderOpts.faderId = mixer.id;