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

Merge pull request #291 from Astagor/browse_passive_users 

Browse passive participants
auto_join_3.3
Mészáros Mihály 2020-05-13 10:11:01 +02:00 committed by GitHub
parent f99ae41eb3 e4f6bde164
commit ba8efb19ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 93 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/RoomClient.js
View File

@ -302,6 +302,16 @@ export default class RoomClient
switch (key)
{
case String.fromCharCode(37):
{
this._spotlights.setPrevAsSelected();
break;
}
case String.fromCharCode(39):
{
this._spotlights.setNextAsSelected();
break;
}
case 'A': // Activate advanced mode
{
store.dispatch(settingsActions.toggleAdvancedMode());

63
app/src/Spotlights.js
View File

@ -12,6 +12,7 @@ export default class Spotlights extends EventEmitter
this._signalingSocket = signalingSocket;
this._maxSpotlights = maxSpotlights;
this._peerList = [];
this._unmutablePeerList = [];
this._selectedSpotlights = [];
this._currentSpotlights = [];
this._started = false;
@ -45,6 +46,66 @@ export default class Spotlights extends EventEmitter
}
}
setNextAsSelected()
{
let peerId = null;
if (this._selectedSpotlights.length > 0) {
peerId = this._selectedSpotlights[0];
} else if (this._unmutablePeerList.length > 0) {
peerId = this._unmutablePeerList[0];
}
if (peerId != null && this._currentSpotlights.length < this._unmutablePeerList.length) {
let oldIndex = this._unmutablePeerList.indexOf(peerId);
let index = oldIndex;
index++;
do {
if (index >= this._unmutablePeerList.length) {
index = 0;
}
let newSelectedPeer = this._unmutablePeerList[index];
if (!this._currentSpotlights.includes(newSelectedPeer)) {
this.setPeerSpotlight(newSelectedPeer);
break;
}
index++;
if (index === oldIndex) {
break;
}
} while (true);
}
}
setPrevAsSelected()
{
let peerId = null;
if (this._selectedSpotlights.length > 0) {
peerId = this._selectedSpotlights[0];
} else if (this._unmutablePeerList.length > 0) {
peerId = this._unmutablePeerList[0];
}
if (peerId != null && this._currentSpotlights.length < this._unmutablePeerList.length) {
let oldIndex = this._unmutablePeerList.indexOf(peerId);
let index = oldIndex;
index--;
do {
if (index < 0) {
index = this._unmutablePeerList.length - 1;
}
let newSelectedPeer = this._unmutablePeerList[index];
if (!this._currentSpotlights.includes(newSelectedPeer)) {
this.setPeerSpotlight(newSelectedPeer);
break;
}
index--;
if (index === oldIndex) {
break;
}
} while (true);
}
}
setPeerSpotlight(peerId)
{
logger.debug('setPeerSpotlight() [peerId:"%s"]', peerId);
@ -114,6 +175,7 @@ export default class Spotlights extends EventEmitter
logger.debug('_handlePeer() | adding peer [peerId: "%s"]', id);
this._peerList.push(id);
this._unmutablePeerList.push(id);
if (this._started)
this._spotlightsUpdated();
@ -126,6 +188,7 @@ export default class Spotlights extends EventEmitter
'room "peerClosed" event [peerId:%o]', id);
this._peerList = this._peerList.filter((peer) => peer !== id);
this._unmutablePeerList = this._unmutablePeerList.filter((peer) => peer !== id);
this._selectedSpotlights = this._selectedSpotlights.filter((peer) => peer !== id);

3
app/src/components/Controls/Help.js
View File

@ -23,7 +23,8 @@ const shortcuts=[
{ key: '1', label: 'label.democratic', defaultMessage: 'Democratic View' },
{ key: '2', label: 'label.filmstrip', defaultMessage: 'Filmstrip View' },
{ key: 'space', label: 'me.mutedPTT', defaultMessage: 'Push SPACE to talk' },
{ key: 'a', label: 'label.advanced', defaultMessage: 'Show advanced information' }
{ key: 'a', label: 'label.advanced', defaultMessage: 'Show advanced information' },
{ key: String.fromCharCode(8592)+' '+String.fromCharCode(8594), label: 'room.browsePeersSpotlight', defaultMessage: 'Browse participants into Spotlight' }
];
const styles = (theme) =>
({

1
app/src/translations/cn.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/cs.json
View File

@ -62,6 +62,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/de.json
View File

@ -63,6 +63,7 @@
"room.help": "Hilfe",
"room.about": "Über",
"room.shortcutKeys": "Tastaturkürzel",
"room.browsePeersSpotlight": null,
"me.mutedPTT": "Du bist stummgeschaltet. Halte die SPACE-Taste um zu sprechen",

1
app/src/translations/dk.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/el.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/en.json
View File

@ -63,6 +63,7 @@
"room.help": "Help",
"room.about": "About",
"room.shortcutKeys": "Shortcut Keys",
"room.browsePeersSpotlight": null,
"me.mutedPTT": "You are muted, hold down SPACE-BAR to talk",

1
app/src/translations/es.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/fr.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/hr.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": "Utišani ste, pritisnite i držite SPACE tipku za razgovor",

1
app/src/translations/hu.json
View File

@ -63,6 +63,7 @@
"room.help": "Segítség",
"room.about": "Névjegy",
"room.shortcutKeys": "Billentyűparancsok",
"room.browsePeersSpotlight": null,
"me.mutedPTT": "Némítva vagy, ha beszélnél nyomd le a szóköz billentyűt",

1
app/src/translations/it.json
View File

@ -63,6 +63,7 @@
"room.help": "Aiuto",
"room.about": "Informazioni su",
"room.shortcutKeys": "Scorciatoie da tastiera",
"room.browsePeersSpotlight": null,
"me.mutedPTT": "Sei mutato, tieni premuto SPAZIO per parlare",

1
app/src/translations/lv.json
View File

@ -62,6 +62,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": "Jūs esat noklusināts. Turiet taustiņu SPACE-BAR, lai runātu",

1
app/src/translations/nb.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": "Du er dempet, hold nede SPACE for å snakke",

1
app/src/translations/pl.json
View File

@ -63,6 +63,7 @@
"room.help": "Pomoc",
"room.about": "O pogramie",
"room.shortcutKeys": "Skróty klawiaturowe",
"room.browsePeersSpotlight": null,
"me.mutedPTT": "Masz wyciszony mikrofon, przytrzymaj spację aby mówić",

1
app/src/translations/pt.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/ro.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/tr.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,

1
app/src/translations/uk.json
View File

@ -63,6 +63,7 @@
"room.help": null,
"room.about": null,
"room.shortcutKeys": null,
"room.browsePeersSpotlight": null,
"me.mutedPTT": null,