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-3118 - reload audio globally configurable

This commit is contained in:
Seth Call 2015-04-29 22:03:02 -05:00
parent 69ccf0d4e5
commit 68b4ab529a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/app/assets/javascripts/wizard/gear_utils.js
View File

@ -34,9 +34,11 @@
// as well have a score below 20 ms
gearUtils.canPlayWithOthers = function(profile) {
if(!context.jamClient.IsAudioStarted()) {
context.jamClient.ReloadAudioSystem(true, true, true);
context.jamClient.StopAudio();
if(gon.global.gear_check_reload_audio) {
if (!context.jamClient.IsAudioStarted()) {
context.jamClient.ReloadAudioSystem(true, true, true);
context.jamClient.StopAudio();
}
}

1
web/config/application.rb
View File

@ -332,5 +332,6 @@ if defined?(Bundler)
config.alerts_api_enabled = true
config.gear_check_ignore_high_latency = false
config.gear_check_reload_audio = true
end
end

1
web/config/initializers/gon.rb
View File

@ -14,4 +14,5 @@ Gon.global.recurly_public_api_key = Rails.application.config.recurly_public_api_
Gon.global.one_free_jamtrack_per_user = Rails.application.config.one_free_jamtrack_per_user
Gon.global.video_available = Rails.application.config.video_available
Gon.global.gear_check_ignore_high_latency = Rails.application.config.gear_check_ignore_high_latency
Gon.global.gear_check_reload_audio = Rails.application.config.gear_check_reload_audio
Gon.global.env = Rails.env