From 81467d6654973d4cf16c524083b81fff10478f42 Mon Sep 17 00:00:00 2001 From: Jonathon Wilson Date: Mon, 27 May 2013 09:34:24 -0600 Subject: [PATCH] FTUE audio settings. Load dropdowns with real audio devices. --- app/assets/javascripts/fakeJamClient.js | 24 +++++++++++++++++++ app/assets/javascripts/ftue.js | 32 +++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/app/assets/javascripts/fakeJamClient.js b/app/assets/javascripts/fakeJamClient.js index 2271e047d..5540ef69a 100644 --- a/app/assets/javascripts/fakeJamClient.js +++ b/app/assets/javascripts/fakeJamClient.js @@ -26,6 +26,27 @@ function FTUEGetStatus() { return ftueStatus; } function FTUESetStatus(b) { ftueStatus = b; } + function FTUEGetMusicInputs() { + dbg('FTUEGetMusicInputs'); + return { + "i~11~MultiChannel (FW AP Multi)~0^i~11~Multichannel (FW AP Multi)~1": + "Multichannel (FW AP Multi) - Channel 1/Multichannel (FW AP Multi) - Channel 2" + }; + } + function FTUEGetMusicOutputs() { + dbg('FTUEGetMusicOutputs'); + return { + "o~11~Multichannel (FW AP Multi)~0^o~11~Multichannel (FW AP Multi)~1": + "Multichannel (FW AP Multi) - Channel 1/Multichannel (FW AP Multi) - Channel 2" + }; + } + function FTUEGetChatInputs() { + dbg('FTUEGetChatInputs'); + return { + "i~11~MultiChannel (FW AP Multi)~0^i~11~Multichannel (FW AP Multi)~1": + "Multichannel (FW AP Multi) - Channel 1/Multichannel (FW AP Multi) - Channel 2" + }; + } function GetOS() { return 100000000; } function GetOSAsString() { return "Win32"; } @@ -364,6 +385,9 @@ // FTUE (round 3) this.FTUEGetStatus = FTUEGetStatus; this.FTUESetStatus = FTUESetStatus; + this.FTUEGetMusicInputs = FTUEGetMusicInputs; + this.FTUEGetMusicOutputs = FTUEGetMusicOutputs; + this.FTUEGetChatInputs = FTUEGetChatInputs; // Session this.SessionAddTrack = SessionAddTrack; diff --git a/app/assets/javascripts/ftue.js b/app/assets/javascripts/ftue.js index 85e9af2f5..571bbe58a 100644 --- a/app/assets/javascripts/ftue.js +++ b/app/assets/javascripts/ftue.js @@ -153,12 +153,44 @@ } + /** + * This function loads the available audio devices from jamClient, and + * builds up the select dropdowns in the audio-settings step of the FTUE wizard. + */ + function loadAudioDevices() { + var funcs = [ + jamClient.FTUEGetMusicInputs, + jamClient.FTUEGetMusicOutputs, + jamClient.FTUEGetChatInputs + ]; + var selectors = [ + '[layout-wizard-step="2"] .audio-input select', + '[layout-wizard-step="2"] .voice-chat-input select', + '[layout-wizard-step="2"] .audio-output select' + ]; + var optionsHtml = ''; + var optionFunc = function(deviceKey, index, list) { + optionsHtml += ''; + }; + for (var i=0; i