noby/workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix conflict error

Browse Source
This commit is contained in:
Gregoire Parant 2020-10-27 20:51:11 +01:00
parent 855f42a12e
commit df49ea856a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
front/src/WebRtc/MediaManager.ts
View File

@ -167,7 +167,7 @@ export class MediaManager {
gameOverlay.classList.remove('active'); gameOverlay.classList.remove('active');
} }
private enableCamera() { public enableCamera() {
this.enableCameraStyle(); this.enableCameraStyle();
this.constraintsMedia.video = videoConstraint; this.constraintsMedia.video = videoConstraint;
this.getCamera().then((stream: MediaStream) => { this.getCamera().then((stream: MediaStream) => {
@ -175,7 +175,7 @@ export class MediaManager {
}); });
} }
private async disableCamera() { public async disableCamera() {
this.disableCameraStyle(); this.disableCameraStyle();
this.stopCamera(); this.stopCamera();
@ -187,7 +187,7 @@ export class MediaManager {
} }
} }
private enableMicrophone() { public enableMicrophone() {
this.enableMicrophoneStyle(); this.enableMicrophoneStyle();
this.constraintsMedia.audio = true; this.constraintsMedia.audio = true;
@ -196,7 +196,7 @@ export class MediaManager {
}); });
} }
private async disableMicrophone() { public async disableMicrophone() {
this.disableMicrophoneStyle(); this.disableMicrophoneStyle();
this.stopMicrophone(); this.stopMicrophone();
@ -574,7 +574,7 @@ export class MediaManager {
return elem as T; return elem as T;
} }
private showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){ public showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){
//create report text area //create report text area
const mainContainer = this.getElementByIdOrFail<HTMLDivElement>('main-container'); const mainContainer = this.getElementByIdOrFail<HTMLDivElement>('main-container');