From df128e05917fb157a566a78633c6c3ec37b85fc4 Mon Sep 17 00:00:00 2001 From: Carlos Santos <4a.santos@gmail.com> Date: Wed, 19 Oct 2022 12:29:02 +0200 Subject: [PATCH] openvidu-components: Clean code --- .../e2e/utils.po.test.ts | 3 -- .../lib/services/openvidu/openvidu.service.ts | 44 +++++++++---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/openvidu-components-angular/e2e/utils.po.test.ts b/openvidu-components-angular/e2e/utils.po.test.ts index 03b096b3..7a8e55e6 100644 --- a/openvidu-components-angular/e2e/utils.po.test.ts +++ b/openvidu-components-angular/e2e/utils.po.test.ts @@ -58,9 +58,6 @@ export class OpenViduComponentsPO { expect(await this.isPresent('#media-buttons-container')).to.be.true; } - - // Angular library - async clickOn(selector: string): Promise { const element = await this.waitForElement(selector); await element.click(); 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 3971646d..6ed8f07f 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 @@ -1,18 +1,18 @@ import { Injectable } from '@angular/core'; -import { Connection, OpenVidu, OpenViduError, OpenViduErrorName, Publisher, PublisherProperties, Session, SignalOptions, Stream } from 'openvidu-browser'; +import { Connection, OpenVidu, OpenViduError, OpenViduErrorName, Publisher, PublisherProperties, Session, SignalOptions } from 'openvidu-browser'; import { LoggerService } from '../logger/logger.service'; -import { ILogger } from '../../models/logger.model'; -import { Signal } from '../../models/signal.model'; -import { OpenViduAngularConfigService } from '../config/openvidu-angular.config.service'; -import { PlatformService } from '../platform/platform.service'; -import { DeviceService } from '../device/device.service'; import { CameraType } from '../../models/device.model'; -import { ScreenType, VideoType } from '../../models/video-type.model'; -import { ParticipantService } from '../participant/participant.service'; -import { TokenService } from '../token/token.service'; +import { ILogger } from '../../models/logger.model'; import { OpenViduEdition } from '../../models/openvidu.model'; +import { Signal } from '../../models/signal.model'; +import { ScreenType, VideoType } from '../../models/video-type.model'; +import { OpenViduAngularConfigService } from '../config/openvidu-angular.config.service'; +import { DeviceService } from '../device/device.service'; +import { ParticipantService } from '../participant/participant.service'; +import { PlatformService } from '../platform/platform.service'; +import { TokenService } from '../token/token.service'; @Injectable({ providedIn: 'root' @@ -444,19 +444,19 @@ export class OpenViduService { } } - private destroyPublisher(publisher: Publisher): void { - if (!!publisher) { - if (publisher.stream.getWebRtcPeer()) { - publisher.stream.disposeWebRtcPeer(); - } - publisher.stream.disposeMediaStream(); - if (publisher.id === this.participantService.getMyCameraPublisher().id) { - this.participantService.setMyCameraPublisher(publisher); - } else if (publisher.id === this.participantService.getMyScreenPublisher().id) { - this.participantService.setMyScreenPublisher(publisher); - } - } - } + // private destroyPublisher(publisher: Publisher): void { + // if (!!publisher) { + // if (publisher.stream.getWebRtcPeer()) { + // publisher.stream.disposeWebRtcPeer(); + // } + // publisher.stream.disposeMediaStream(); + // if (publisher.id === this.participantService.getMyCameraPublisher().id) { + // this.participantService.setMyCameraPublisher(publisher); + // } else if (publisher.id === this.participantService.getMyScreenPublisher().id) { + // this.participantService.setMyScreenPublisher(publisher); + // } + // } + // } private async createMediaStream(pp: PublisherProperties): Promise { let mediaStream: MediaStream;