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

Changes from FTUE review. Save takes bool. New Refresh on resync. Use -1 for 'default' on latency selects.

This commit is contained in:
Jonathon Wilson 2013-06-13 19:43:11 -06:00
parent c57b17c00a
commit fce7126ab2
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/fakeJamClient.js
View File

@ -68,7 +68,8 @@
context.alert("Simulated ASIO Dialog");
}
function FTUEInit() { dbg("FTUEInit"); }
function FTUESave() { dbg("FTUESave"); }
function FTUERefreshDevices() { dbg("FTUERefreshDevices()"); }
function FTUESave(b) { dbg("FTUESave(" + b + ")"); }
function FTUEGetStatus() { return ftueStatus; }
function FTUESetStatus(b) { ftueStatus = b; }
function FTUESetMusicDevice(id) { dbg("FTUESetMusicDevice"); }
@ -489,6 +490,7 @@
this.FTUEOpenControlPanel = FTUEOpenControlPanel;
this.FTUERegisterLatencyCallback = FTUERegisterLatencyCallback;
this.FTUERegisterVUCallbacks = FTUERegisterVUCallbacks;
this.FTUERefreshDevices = FTUERefreshDevices;
this.FTUESave = FTUESave;
this.FTUESetChatInput = FTUESetChatInput;
this.FTUESetChatInputVolume = FTUESetChatInputVolume;

23
app/assets/javascripts/ftue.js
View File

@ -103,7 +103,8 @@
var latencyMS = context.JK.FtueWizard.latencyMS;
if (latencyMS <= 20) {
logger.debug(latencyMS + " is <= 20. Setting FTUE status to true");
context.jamClient.FTUESetStatus(true);
ftueSave(true); // Save the profile
context.jamClient.FTUESetStatus(true); // No FTUE wizard next time
}
updateGauge();
}
@ -205,10 +206,10 @@
}
function asioResync(evt) {
ftueSave();
jamClient.FTUERefreshDevices();
}
function ftueSave() {
function ftueSave(persist) {
// Explicitly set inputs and outputs to dropdown values
// before save as the client seems to want this on changes to
// things like frame size, etc..
@ -219,8 +220,8 @@
});
if (musicInAndOutSet()) {
logger.debug("Calling FTUESave()");
var response = jamClient.FTUESave();
logger.debug("Calling FTUESave(" + persist + ")");
var response = jamClient.FTUESave(persist);
setLevels(0);
if (response) {
context.alert(response);
@ -237,7 +238,7 @@
}
logger.debug("Calling FTUESetFrameSize(" + val + ")");
jamClient.FTUESetFrameSize(val);
ftueSave();
ftueSave(false);
}
function setAsioInputLatency(evt) {
var val = parseInt($(evt.currentTarget).val(),10);
@ -246,7 +247,7 @@
}
logger.debug("Calling FTUESetInputLatency(" + val + ")");
jamClient.FTUESetInputLatency(val);
ftueSave();
ftueSave(false);
}
function setAsioOutputLatency(evt) {
var val = parseInt($(evt.currentTarget).val(),10);
@ -255,7 +256,7 @@
}
logger.debug("Calling FTUESetOutputLatency(" + val + ")");
jamClient.FTUESetOutputLatency(val);
ftueSave();
ftueSave(false);
}
function events() {
@ -300,8 +301,8 @@
$('[layout-wizard-step="2"] .settings-asio select').removeAttr("disabled");
// Set selects to lowest possible values to start:
$('#asio-framesize').val('2.5').change();
$('#asio-input-latency').val('0').change();
$('#asio-output-latency').val('0').change();
$('#asio-input-latency').val('-1').change();
$('#asio-output-latency').val('-1').change();
}
}
@ -336,7 +337,7 @@
var $select = $(evt.currentTarget);
setAudioDevice($select);
if (musicInAndOutSet()) {
ftueSave();
ftueSave(false);
setVuCallbacks();
}
}

4
app/views/clients/_ftue.html.erb
View File

@ -73,7 +73,7 @@
<div class="subcolumn second">
Buffer/In:<br />
<select disabled="disabled" id="asio-input-latency">
<option value=""></option>
<option value="-1">Default</option>
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
@ -90,7 +90,7 @@
<div class="subcolumn third">
Buffer/Out:<br />
<select disabled="disabled" id="asio-output-latency">
<option value=""></option>
<option value="-1">Default</option>
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>