From 0c58542ebc14ecb9296a41fc8b2f8c46d60c7cb2 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 27 May 2013 15:08:45 -0400 Subject: [PATCH] VRFS-317 use new JS bridge function to account for device latency --- app/assets/javascripts/fakeJamClient.js | 3 +++ app/assets/javascripts/sessionList.js | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/fakeJamClient.js b/app/assets/javascripts/fakeJamClient.js index b27eafc48..7d9cf59fd 100644 --- a/app/assets/javascripts/fakeJamClient.js +++ b/app/assets/javascripts/fakeJamClient.js @@ -142,6 +142,8 @@ function SessionStopPlay() {} function SessionStopRecording() {} + function SessionGetDeviceLatency() { return 10.0; } + function SessionGetMasterLocalMix() { logger.debug('SessionGetMasterLocalMix. Returning: ' + _mix); return _mix; @@ -377,6 +379,7 @@ this.SetVURefreshRate = SetVURefreshRate; this.SessionGetMasterLocalMix = SessionGetMasterLocalMix; this.SessionSetMasterLocalMix = SessionSetMasterLocalMix; + this.SessionGetDeviceLatency = SessionGetDeviceLatency; // Track this.TrackGetChannels = TrackGetChannels; diff --git a/app/assets/javascripts/sessionList.js b/app/assets/javascripts/sessionList.js index 4e7c3637f..37dbf992e 100644 --- a/app/assets/javascripts/sessionList.js +++ b/app/assets/javascripts/sessionList.js @@ -28,14 +28,19 @@ var latencyInfo = sessionLatency.sessionInfo(session.id); var latencyDescription = ""; var latencyStyle = ""; - var gearLatency = 0.0; // TODO: call JS bridge to get gear latency + var gearLatency = context.jamClient.SessionGetDeviceLatency(); var showJoinLink = true; - if (latencyInfo.averageLatency + gearLatency <= LATENCY.GOOD.max) { + var totalLatency = latencyInfo.averageLatency + gearLatency; + + logger.debug("latencyInfo.averageLatency=" + latencyInfo.averageLatency); + logger.debug("gearLatency=" + gearLatency); + + if (totalLatency <= LATENCY.GOOD.max) { latencyDescription = LATENCY.GOOD.description; latencyStyle = "latency-green"; } - else if (latencyInfo.averageLatency + gearLatency > LATENCY.MEDIUM.min && latencyInfo.averageLatency + gearLatency <= LATENCY.MEDIUM.max) { + else if (totalLatency > LATENCY.MEDIUM.min && totalLatency <= LATENCY.MEDIUM.max) { latencyDescription = LATENCY.MEDIUM.description; latencyStyle = "latency-medium"; }