FTUE: audio in/out set to 0DB instead of -80DB on settings init. Fix visual problems.

This commit is contained in:
Jonathon Wilson 2013-06-10 20:04:51 -06:00
parent 65bf5d225f
commit 7cde817e63
3 changed files with 7 additions and 14 deletions

View File

@ -8,7 +8,7 @@
logger.info("*** Fake JamClient instance initialized. ***");
// Change this to false if you want to see FTUE with fake jam client
var ftueStatus = true;
var ftueStatus = false;
var eventCallbackName = '';
var eventCallbackRate = 1000;
var vuValue = -70;
@ -179,7 +179,7 @@
// Session Functions
function SessionAddTrack() {}
function SessionGetControlState(mixerIds) {
dbg("SessionGetControlState")
dbg("SessionGetControlState");
var groups = [0, 1, 2, 3, 7, 9];
var names = [
"FW AP Multi",

View File

@ -75,14 +75,13 @@
function settingsInit() {
jamClient.FTUEInit();
// Set all mixer levels to -80
// Using the Session* apis to do so.
var trackIds = jamClient.SessionGetIDs();
var controlStates = jamClient.SessionGetControlState(trackIds);
$.each(controlStates, function(index, value) {
context.JK.Mixer.fillTrackVolume(value, false);
context.trackVolumeObject.volL = -80;
context.trackVolumeObject.volR = -80;
// Default input/output to 0 DB
context.trackVolumeObject.volL = 0;
context.trackVolumeObject.volR = 0;
jamClient.SessionSetControlState(trackIds[index]);
});
}
@ -323,8 +322,6 @@
}
function setVuCallbacks() {
// jamClient.FTUERegisterVUCallbacks(
// output_callback, input_callback, chat_input_callback);
jamClient.FTUERegisterVUCallbacks(
"JK.ftueAudioOutputVUCallback",
"JK.ftueAudioInputVUCallback",
@ -340,11 +337,6 @@
win32 = false;
$('[layout-wizard-step="2"] p[os="win32"]').hide();
$('[layout-wizard-step="2"] p[os="mac"]').show();
//$('[layout-wizard-step="2"] .settings-driver').hide();
// Slide columns:
//$('[layout-wizard-step="2"] .settings-asio').addClass('mac');
//$('[layout-wizard-step="2"] .settings-asio-button').addClass('mac');
$('#btn-asio-control-panel').hide();
$('[layout-wizard-step="2"] .settings-controls select').removeAttr("disabled");
loadAudioDevices();

View File

@ -39,11 +39,12 @@
div.dialog.ftue {
min-width: 800px;
max-width: 800px;
min-height: 400px;
max-height: 400px;
.ftue-inner {
line-height: 1.3em;
width: auto;
border: 1px solid $ColorScreenPrimary;
a {
text-decoration: underline;