Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #364 from Astagor/browse_passive_users 

Browse passive users - fixed for filmstrip
auto_join_3.3
Mészáros Mihály 2020-05-14 21:47:07 +02:00 committed by GitHub
parent aae9e15812 daf958d627
commit 042bc95b3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/RoomClient.js
View File

@ -304,12 +304,18 @@ export default class RoomClient
{ {
case String.fromCharCode(37): case String.fromCharCode(37):
{ {
this._spotlights.setPrevAsSelected(); const newPeerId = this._spotlights.getPrevAsSelected(
store.getState().room.selectedPeerId);
if (newPeerId) this.setSelectedPeer(newPeerId);
break; break;
} }
case String.fromCharCode(39): case String.fromCharCode(39):
{ {
this._spotlights.setNextAsSelected(); const newPeerId = this._spotlights.getNextAsSelected(
store.getState().room.selectedPeerId);
if (newPeerId) this.setSelectedPeer(newPeerId);
break; break;
} }
case 'A': // Activate advanced mode case 'A': // Activate advanced mode

54
app/src/Spotlights.js
View File

@ -46,90 +46,72 @@ export default class Spotlights extends EventEmitter
} }
} }
setNextAsSelected() getNextAsSelected(peerId)
{ {
let peerId = null; let newSelectedPeer = null;
if (this._selectedSpotlights.length > 0) if (peerId == null && this._unmutablePeerList.length > 0)
{
peerId = this._selectedSpotlights[0];
}
else if (this._unmutablePeerList.length > 0)
{ {
peerId = this._unmutablePeerList[0]; peerId = this._unmutablePeerList[0];
} }
if (peerId != null && if (peerId != null && this._currentSpotlights.length < this._unmutablePeerList.length)
this._currentSpotlights.length < this._unmutablePeerList.length)
{ {
const oldIndex = this._unmutablePeerList.indexOf(peerId); const oldIndex = this._unmutablePeerList.indexOf(peerId);
let index = oldIndex; let index = oldIndex;
index++; index++;
do for (let i = 0; i < this._unmutablePeerList.length; i++)
{ {
if (index >= this._unmutablePeerList.length) if (index >= this._unmutablePeerList.length)
{ {
index = 0; index = 0;
} }
const newSelectedPeer = this._unmutablePeerList[index]; newSelectedPeer = this._unmutablePeerList[index];
if (!this._currentSpotlights.includes(newSelectedPeer)) if (!this._currentSpotlights.includes(newSelectedPeer))
{ {
this.setPeerSpotlight(newSelectedPeer);
break; break;
} }
index++; index++;
if (index === oldIndex)
{
break;
}
} while (true);
} }
} }
setPrevAsSelected() return newSelectedPeer;
{
let peerId = null;
if (this._selectedSpotlights.length > 0)
{
peerId = this._selectedSpotlights[0];
} }
else if (this._unmutablePeerList.length > 0)
getPrevAsSelected(peerId)
{
let newSelectedPeer = null;
if (peerId == null && this._unmutablePeerList.length > 0)
{ {
peerId = this._unmutablePeerList[0]; peerId = this._unmutablePeerList[0];
} }
if (peerId != null && if (peerId != null && this._currentSpotlights.length < this._unmutablePeerList.length)
this._currentSpotlights.length < this._unmutablePeerList.length)
{ {
const oldIndex = this._unmutablePeerList.indexOf(peerId); const oldIndex = this._unmutablePeerList.indexOf(peerId);
let index = oldIndex; let index = oldIndex;
index--; index--;
do for (let i = 0; i < this._unmutablePeerList.length; i++)
{ {
if (index < 0) if (index < 0)
{ {
index = this._unmutablePeerList.length - 1; index = this._unmutablePeerList.length - 1;
} }
const newSelectedPeer = this._unmutablePeerList[index]; newSelectedPeer = this._unmutablePeerList[index];
if (!this._currentSpotlights.includes(newSelectedPeer)) if (!this._currentSpotlights.includes(newSelectedPeer))
{ {
this.setPeerSpotlight(newSelectedPeer);
break; break;
} }
index--; index--;
if (index === oldIndex)
{
break;
} }
} while (true);
} }
return newSelectedPeer;
} }
setPeerSpotlight(peerId) setPeerSpotlight(peerId)