_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:thecodingmachine/workadventure

Browse Source
This commit is contained in:
_Bastler 2021-10-07 15:01:11 +02:00
commit 448fd61426
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"; import { onDestroy } from "svelte";
function screenSharingClick(): void { function screenSharingClick(): void {
if (isSilent) return;
if ($requestedScreenSharingState === true) { if ($requestedScreenSharingState === true) {
requestedScreenSharingState.disableScreenSharing(); requestedScreenSharingState.disableScreenSharing();
} else { } else {
@ -23,6 +24,7 @@
} }
function cameraClick(): void { function cameraClick(): void {
if (isSilent) return;
if ($requestedCameraState === true) { if ($requestedCameraState === true) {
requestedCameraState.disableWebcam(); requestedCameraState.disableWebcam();
} else { } else {
@ -31,6 +33,7 @@
} }
function microphoneClick(): void { function microphoneClick(): void {
if (isSilent) return;
if ($requestedMicrophoneState === true) { if ($requestedMicrophoneState === true) {
requestedMicrophoneState.disableMicrophone(); requestedMicrophoneState.disableMicrophone();
} else { } 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(); export const videoConstraintStore = createVideoConstraintStore();
/** /**
@ -234,6 +239,7 @@ export const mediaStreamConstraintsStore = derived(
audioConstraintStore, audioConstraintStore,
privacyShutdownStore, privacyShutdownStore,
cameraEnergySavingStore, cameraEnergySavingStore,
isSilentStore,
], ],
( (
[ [
@ -245,6 +251,7 @@ export const mediaStreamConstraintsStore = derived(
$audioConstraintStore, $audioConstraintStore,
$privacyShutdownStore, $privacyShutdownStore,
$cameraEnergySavingStore, $cameraEnergySavingStore,
$isSilentStore,
], ],
set set
) => { ) => {
@ -294,6 +301,11 @@ export const mediaStreamConstraintsStore = derived(
//currentAudioConstraint = false; //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. // Let's make the changes only if the new value is different from the old one.
if ( if (
previousComputedVideoConstraint != currentVideoConstraint || 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);