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

VRFS-633 VRFS-636 cleanup, logs

This commit is contained in:
Brian Smith 2013-09-07 01:13:26 -04:00
parent 5545db2543
commit f183cd4e84
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/addTrack.js
View File

@ -14,12 +14,6 @@
TRACK2: 2
};
var VOICE_CHAT = {
CHAT: "0",
SESSION: "1",
MIC: "2"
};
var instrument_array = [];
// dialog variables
@ -29,14 +23,14 @@
function events() {
$('#btn-add-track').unbind("click");
// Track 2 Add
$('#img-add-track2-input-add').unbind("click");
$('#img-add-track2-input-add').click(function() {
$('#add-track2-unused > option:selected').remove().appendTo('#add-track2-input');
});
// Track 2 Remove
$('#img-add-track2-input-remove').unbind("click");
$('#img-add-track2-input-remove').click(function() {
$('#add-track2-input > option:selected').remove().appendTo('#add-track2-unused');
});
@ -51,6 +45,7 @@
// app.layout.closeDialog('error-dialog');
// });
$('#btn-add-track').unbind("click");
$('#btn-add-track').click(saveSettings);
}

25
app/assets/javascripts/configureTrack.js
View File

@ -244,17 +244,16 @@
function syncVoiceChatDialog() {
logger.debug("syncVoiceChatDialog:originalVoiceChat=" + originalVoiceChat);
var $option1 = $('#voice-chat-device > option[value="1"]');
// remove Session Audio option from voice chat if none are available
if ($('#audio-inputs-unused > option').size() === 0 && originalVoiceChat !== VOICE_CHAT.SESSION) {
// remove Session Audio option from voice chat if none are available
// if (inputUnassignedList.length === 0 && originalVoiceChat !== VOICE_CHAT.SESSION) {
if ($('#audio-inputs-unused > option').size() === 0 && originalVoiceChat != VOICE_CHAT.SESSION) {
logger.debug('Removing Option 1 from Voice Chat dropdown.');
$('#voice-chat-device > option[value="1"]').remove();
$option1.remove();
}
else {
// make sure it's not already in list before adding back
if ($('#voice-chat-device > option[value="1"]').length === 0) {
if ($option1.length === 0) {
logger.debug('Adding Option 1 back to Voice Chat dropdown.');
$('#voice-chat-device').prepend('<option value="1">Use an input on my session audio device for chat</option>');
}
@ -302,6 +301,9 @@
removedAudioChannels = {};
removedVoiceChatChannels = {};
context.jamClient.TrackLoadAssignments();
initDialogData();
// refresh dialog
showVoiceChatPanel(true);
showMusicAudioPanel(true);
@ -474,15 +476,6 @@
}
function initDialogData() {
inputUnassignedList = [];
track1AudioInputChannels = [];
track2AudioInputChannels = [];
outputUnassignedList = [];
outputAssignedList = [];
chatUnassignedList = [];
chatAssignedList = [];
chatOtherUnassignedList = [];
chatOtherAssignedList = [];
// set arrays
inputUnassignedList = _loadList(ASSIGNMENT.UNASSIGNED, true, false);
@ -694,7 +687,7 @@
}
}
logger.debug("myTrackCount=" + myTrackCount);
logger.debug("validateAudioSettings:myTrackCount=" + myTrackCount);
// if Track 2 exists, verify Input and Instrument exist
if (isValid && myTrackCount > 1) {
@ -783,7 +776,7 @@
events();
_init();
myTrackCount = myTracks.length;
logger.debug("myTrackCount=" + myTrackCount);
logger.debug("initialize:myTrackCount=" + myTrackCount);
toggleTrack2ConfigDetails(myTrackCount > 1);
};

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

@ -422,14 +422,10 @@
_addTrack(index, trackData);
// Show settings icons only for my tracks
var $trackSettings = $('div[mixer-id="' + mixer.id + '"].track-icon-settings');
if (myTrack) {
var $trackSettings = $('div[mixer-id="' + mixer.id + '"].track-icon-settings');
$trackSettings.show();
myTracks.push(trackData);
logger.debug("added trackData to myTracks " + JSON.stringify(trackData));
}
else {
$trackSettings.hide();
}
// TODO: UNCOMMENT THIS WHEN TESTING LOCALLY IN BROWSER
//myTracks.push(trackData);