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

Fix screen sharing spinner

Browse Source 
Check if the peer connection is already connected status. In this case, the status store must be set to 'connected'.
In the case or player A send stream and player B send a stream, it's same peer connection, also the status must be changed to connect.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
This commit is contained in:
Gregoire Parant 2022-01-28 18:33:42 +01:00
parent 34c077f470
commit dfd594ec17
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/src/Phaser/Game/GameScene.ts
View File

@ -1605,6 +1605,7 @@ ${escapedMessage}
//When we leave game, the camera is stop to be reopen after. //When we leave game, the camera is stop to be reopen after.
// I think that we could keep camera status and the scene can manage camera setup // I think that we could keep camera status and the scene can manage camera setup
//TODO find wy chrome don't manage correctly a multiple ask mediaDevices
//mediaManager.hideMyCamera(); //mediaManager.hideMyCamera();
for (const iframeEvents of this.iframeSubscriptionList) { for (const iframeEvents of this.iframeSubscriptionList) {

11
front/src/WebRtc/ScreenSharingPeer.ts
View File

@ -2,7 +2,7 @@ import type * as SimplePeerNamespace from "simple-peer";
import type { RoomConnection } from "../Connexion/RoomConnection"; import type { RoomConnection } from "../Connexion/RoomConnection";
import { MESSAGE_TYPE_CONSTRAINT, PeerStatus } from "./VideoPeer"; import { MESSAGE_TYPE_CONSTRAINT, PeerStatus } from "./VideoPeer";
import type { UserSimplePeerInterface } from "./SimplePeer"; import type { UserSimplePeerInterface } from "./SimplePeer";
import { Readable, readable } from "svelte/store"; import { Readable, readable, writable, Writable } from "svelte/store";
import { getIceServersConfig } from "../Components/Video/utils"; import { getIceServersConfig } from "../Components/Video/utils";
import { highlightedEmbedScreen } from "../Stores/EmbedScreensStore"; import { highlightedEmbedScreen } from "../Stores/EmbedScreensStore";
import { isMediaBreakpointUp } from "../Utils/BreakpointsUtils"; import { isMediaBreakpointUp } from "../Utils/BreakpointsUtils";
@ -22,7 +22,7 @@ export class ScreenSharingPeer extends Peer {
public readonly userId: number; public readonly userId: number;
public readonly uniqueId: string; public readonly uniqueId: string;
public readonly streamStore: Readable<MediaStream | null>; public readonly streamStore: Readable<MediaStream | null>;
public readonly statusStore: Readable<PeerStatus>; public readonly statusStore: Writable<PeerStatus>;
constructor( constructor(
user: UserSimplePeerInterface, user: UserSimplePeerInterface,
@ -70,7 +70,7 @@ export class ScreenSharingPeer extends Peer {
}; };
}); });
this.statusStore = readable<PeerStatus>("connecting", (set) => { this.statusStore = writable<PeerStatus>("connecting", (set) => {
const onConnect = () => { const onConnect = () => {
set("connected"); set("connected");
}; };
@ -141,6 +141,11 @@ export class ScreenSharingPeer extends Peer {
if (!stream) { if (!stream) {
this.isReceivingStream = false; this.isReceivingStream = false;
} else { } else {
//Check if the peer connection is already in connect status. In this case, the status store must be set to 'connected'.
//In the case or player A send stream and player B send a stream, it's same peer connection, also the status must be changed to connected.
if (this._connected) {
this.statusStore.set("connected");
}
this.isReceivingStream = true; this.isReceivingStream = true;
} }
} }