From f1b6fd8e2ae44a8a4adbc880c758bbc02019fde7 Mon Sep 17 00:00:00 2001 From: Moe Date: Mon, 20 Feb 2023 14:53:33 -0800 Subject: [PATCH] fix initial play state for liveGrid --- web/assets/js/bs5.liveGrid.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/web/assets/js/bs5.liveGrid.js b/web/assets/js/bs5.liveGrid.js index 37b33af9..0d3229c8 100644 --- a/web/assets/js/bs5.liveGrid.js +++ b/web/assets/js/bs5.liveGrid.js @@ -7,7 +7,7 @@ var liveGridData = null var liveGridOpenCountElements = $('.liveGridOpenCount') var liveGridOpenCount = 0 var liveGridPauseScrollTimeout = null; -var liveGridPauseStates = {}; +var liveGridPlayingNow = {}; // var onLiveStreamInitiateExtensions = [] function onLiveStreamInitiate(callback){ @@ -351,13 +351,10 @@ function initiateLiveGridPlayer(monitor,subStreamChannel){ var containerElement = $(`#monitor_live_${monitor.mid}`) var streamType = subStreamChannel ? details.substream ? details.substream.output.stream_type : 'hls' : details.stream_type var isInView = isScrolledIntoView(monitorItem[0]) - if(location.search === '?p2p=1'){ - websocketPath = '/socket.io' - // websocketQuery.machineId = machineId - } if(!isInView){ return; } + liveGridPlayingNow[monitorId] = true switch(streamType){ case'jpeg': startJpegStream(monitorId) @@ -882,12 +879,12 @@ function signalCheckLiveStream(options){ } function pauseMonitorItem(monitorId){ - liveGridPauseStates[monitorId] = false + liveGridPlayingNow[monitorId] = false closeLiveGridPlayer(monitorId,false) } function resumeMonitorItem(monitorId){ // needs to know about substream - liveGridPauseStates[monitorId] = true + liveGridPlayingNow[monitorId] = true resetMonitorCanvas(monitorId,true,null) } function isScrolledIntoView(elem){ @@ -920,7 +917,7 @@ function setPauseStatusForMonitorItems(){ var isVisible = isScrolledIntoView(el) console.log(monitorId,isVisible) if(isVisible){ - if(!liveGridPauseStates[monitorId])resumeMonitorItem(monitorId); + if(!liveGridPlayingNow[monitorId])resumeMonitorItem(monitorId); }else{ pauseMonitorItem(monitorId) } @@ -931,7 +928,7 @@ function setPauseScrollTimeout(){ if(tabTree.name === 'liveGrid'){ liveGridPauseScrollTimeout = setTimeout(function(){ setPauseStatusForMonitorItems() - },1500) + },700) } } $(document).ready(function(e){