From e5e6742400c4e6c43dff9e5d5f2e7c1e262daab6 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 8 May 2015 15:35:17 -0500 Subject: [PATCH] * VRFS-3225 - don't show sampler dropdown if old client --- web/app/assets/javascripts/wizard/gear/gear_wizard.js | 9 ++++++--- .../assets/javascripts/wizard/gear/step_select_gear.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/app/assets/javascripts/wizard/gear/gear_wizard.js b/web/app/assets/javascripts/wizard/gear/gear_wizard.js index 67f82da5b..5f6a3dcb0 100644 --- a/web/app/assets/javascripts/wizard/gear/gear_wizard.js +++ b/web/app/assets/javascripts/wizard/gear/gear_wizard.js @@ -80,9 +80,12 @@ var newProfileName = 'FTUEAttempt-' + new Date().getTime().toString(); logger.debug("setting FTUE-prefixed profile name to: " + newProfileName); context.jamClient.FTUESetMusicProfileName(newProfileName); - context.jamClient.FTUESetPreferredMixerSampleRate(1); - context.jamClient.FTUESetPreferredOutputSampleRate(1); - context.jamClient.FTUESetPreferredChatSampleRate(1); + if(context.jamClient.FTUESetPreferredMixerSampleRate) { + context.jamClient.FTUESetPreferredMixerSampleRate(1); + context.jamClient.FTUESetPreferredOutputSampleRate(1); + context.jamClient.FTUESetPreferredChatSampleRate(1); + } + context.jamClient.FTUEClearChannelAssignments(); newSession(); diff --git a/web/app/assets/javascripts/wizard/gear/step_select_gear.js b/web/app/assets/javascripts/wizard/gear/step_select_gear.js index a08f8f2ed..7c9887ddb 100644 --- a/web/app/assets/javascripts/wizard/gear/step_select_gear.js +++ b/web/app/assets/javascripts/wizard/gear/step_select_gear.js @@ -883,7 +883,7 @@ } // deal with sample rate - if(selectedDeviceInfo) { + if(selectedDeviceInfo && context.jamClient.FTUESetPreferredMixerSampleRate) { // get the preferred sample rate for the device, and set that as the initial value of the sample rate dropdown var inputSampleRate = context.jamClient.FTUEgetInputDeviceSampleRate(selectedDeviceInfo.input.info.port_audio_name); logger.debug("applying the sample rate based on input device: " + selectedDeviceInfo.input.id + " (" + inputSampleRate + ")");