lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #1508 from thecodingmachine/fixSilentZones

Browse source 
FIX: being in a silent zone new forces mediaConstraints to false
This commit is contained in:
Kharhamel 2021-10-07 14:50:40 +02:00 committed by GitHub
parent 900c53f499 9dd3e8ff85
commit 60eefbce94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
front/src/Components/CameraControls.svelte
View file

@ -15,6 +15,7 @@
import {onDestroy} from "svelte";
function screenSharingClick(): void {
if (isSilent) return;
if ($requestedScreenSharingState === true) {
requestedScreenSharingState.disableScreenSharing();
} else {
@ -23,6 +24,7 @@
}
function cameraClick(): void {
if (isSilent) return;
if ($requestedCameraState === true) {
requestedCameraState.disableWebcam();
} else {
@ -31,6 +33,7 @@
}
function microphoneClick(): void {
if (isSilent) return;
if ($requestedMicrophoneState === true) {
requestedMicrophoneState.disableMicrophone();
} else {

22
front/src/Stores/MediaStore.ts
View file

@ -177,6 +177,11 @@ function createVideoConstraintStore() {
};
}
/**
* A store containing if user is silent, so if he is in silent zone. This permit to show et hide camera of user
*/
export const isSilentStore = writable(false);
export const videoConstraintStore = createVideoConstraintStore();
/**
@ -234,6 +239,7 @@ export const mediaStreamConstraintsStore = derived(
audioConstraintStore,
privacyShutdownStore,
cameraEnergySavingStore,
isSilentStore,
],
(
[
@ -245,6 +251,7 @@ export const mediaStreamConstraintsStore = derived(
$audioConstraintStore,
$privacyShutdownStore,
$cameraEnergySavingStore,
$isSilentStore,
],
set
) => {
@ -294,6 +301,11 @@ export const mediaStreamConstraintsStore = derived(
//currentAudioConstraint = false;
}
if ($isSilentStore === true) {
currentVideoConstraint = false;
currentAudioConstraint = false;
}
// Let's make the changes only if the new value is different from the old one.
if (
previousComputedVideoConstraint != currentVideoConstraint ||
@ -607,13 +619,3 @@ localStreamStore.subscribe((streamResult) => {
}
}
});
/**
* A store containing the real active media is mobile
*/
export const obtainedMediaConstraintIsMobileStore = writable(false);
/**
* A store containing if user is silent, so if he is in silent zone. This permit to show et hide camera of user
*/
export const isSilentStore = writable(false);