From 1ee8bd1f6e2b38352345a53e5bf46d082d6b20a2 Mon Sep 17 00:00:00 2001 From: csantosm <4a.santos@gmail.com> Date: Fri, 1 Apr 2022 13:24:56 +0200 Subject: [PATCH] openvidu-components: Renamed service method --- .../lib/components/pre-join/pre-join.component.ts | 4 ++-- .../src/lib/components/toolbar/toolbar.component.ts | 4 ++-- .../src/lib/services/openvidu/openvidu.service.ts | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts index 1801c505..6e73c162 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.ts @@ -117,14 +117,14 @@ export class PreJoinComponent implements OnInit, OnDestroy { async toggleCam() { const publish = this.isVideoMuted; - await this.openviduService.muteVideo(publish); + await this.openviduService.publishVideo(publish); this.isVideoMuted = !this.isVideoMuted; this.storageSrv.setVideoMuted(this.isVideoMuted); } toggleMic() { const publish = this.isAudioMuted; - this.openviduService.muteAudio(publish); + this.openviduService.publishAudio(publish); this.isAudioMuted = !this.isAudioMuted; this.storageSrv.setAudioMuted(this.isAudioMuted); } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts index 424bac85..5e13ba40 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts @@ -288,7 +288,7 @@ export class ToolbarComponent implements OnInit, OnDestroy { async toggleMicrophone() { this.onMicrophoneButtonClicked.emit(); try { - await this.openviduService.muteAudio(!this.isAudioActive); + await this.openviduService.publishAudio(!this.isAudioActive); } catch (error) { this.log.e('There was an error toggling microphone:', error.code, error.message); this.actionService.openDialog('There was an error toggling camera', error?.error || error?.message); @@ -303,7 +303,7 @@ export class ToolbarComponent implements OnInit, OnDestroy { try { const publishVideo = !this.participantService.hasCameraVideoActive(); - await this.openviduService.muteVideo(publishVideo); + await this.openviduService.publishVideo(publishVideo); } catch (error) { this.log.e('There was an error toggling camera:', error.code, error.message); this.actionService.openDialog('There was an error toggling camera', error?.error || error?.message); diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts index c6dca29d..4f9ca494 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/openvidu/openvidu.service.ts @@ -220,13 +220,13 @@ export class OpenViduService { } } - async muteVideo(mute: boolean): Promise { + async publishVideo(publish: boolean): Promise { const publishAudio = this.participantService.hasCameraAudioActive(); // const publishVideo = !this.participantService.hasCameraVideoActive(); // Disabling webcam if (this.participantService.haveICameraAndScreenActive()) { - this.publishVideoAux(this.participantService.getMyCameraPublisher(), mute); + this.publishVideoAux(this.participantService.getMyCameraPublisher(), publish); this.participantService.disableWebcamStream(); this.unpublish(this.participantService.getMyCameraPublisher()); this.publishAudioAux(this.participantService.getMyScreenPublisher(), publishAudio); @@ -245,7 +245,7 @@ export class OpenViduService { this.participantService.enableWebcamStream(); } else { // Muting/unmuting webcam - this.publishVideoAux(this.participantService.getMyCameraPublisher(), mute); + this.publishVideoAux(this.participantService.getMyCameraPublisher(), publish); } } @@ -259,15 +259,15 @@ export class OpenViduService { } } - async muteAudio(value: boolean): Promise { + async publishAudio(publish: boolean): Promise { if (this.participantService.isMyCameraActive()) { if (this.participantService.isMyScreenActive() && this.participantService.hasScreenAudioActive()) { this.publishAudioAux(this.participantService.getMyScreenPublisher(), false); } - this.publishAudioAux(this.participantService.getMyCameraPublisher(), value); + this.publishAudioAux(this.participantService.getMyCameraPublisher(), publish); } else { - this.publishAudioAux(this.participantService.getMyScreenPublisher(), value); + this.publishAudioAux(this.participantService.getMyScreenPublisher(), publish); } }