From 0e80c9b6263f07a68f9c703b004a546269d885b2 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Tue, 4 Dec 2018 09:55:00 +0100 Subject: [PATCH] openvidu-browser: platform library imported in all required classes --- openvidu-browser/src/OpenVidu/LocalRecorder.ts | 8 ++------ openvidu-browser/src/OpenVidu/OpenVidu.ts | 1 - openvidu-browser/src/OpenVidu/Publisher.ts | 3 +++ openvidu-browser/src/OpenVidu/Session.ts | 2 +- openvidu-browser/src/OpenVidu/Stream.ts | 4 +++- openvidu-browser/src/OpenVidu/StreamManager.ts | 3 ++- .../src/OpenViduInternal/WebRtcPeer/WebRtcPeer.ts | 2 ++ .../src/OpenViduInternal/WebRtcStats/WebRtcStats.ts | 1 + 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/openvidu-browser/src/OpenVidu/LocalRecorder.ts b/openvidu-browser/src/OpenVidu/LocalRecorder.ts index 1d8a2eef..78135c73 100644 --- a/openvidu-browser/src/OpenVidu/LocalRecorder.ts +++ b/openvidu-browser/src/OpenVidu/LocalRecorder.ts @@ -17,6 +17,8 @@ import { Stream } from './Stream'; import { LocalRecorderState } from '../OpenViduInternal/Enums/LocalRecorderState'; +import platform = require('platform'); + /** * @hidden @@ -37,10 +39,8 @@ export class LocalRecorder { private mediaRecorder: any; private chunks: any[] = []; private blob: Blob; - private count = 0; private id: string; private videoPreviewSrc: string; - private htmlParentElementId: string; private videoPreview: HTMLVideoElement; /** @@ -207,14 +207,11 @@ export class LocalRecorder { } if (typeof parentElement === 'string') { - this.htmlParentElementId = parentElement; - const parentElementDom = document.getElementById(parentElement); if (parentElementDom) { this.videoPreview = parentElementDom.appendChild(this.videoPreview); } } else { - this.htmlParentElementId = parentElement.id; this.videoPreview = parentElement.appendChild(this.videoPreview); } @@ -231,7 +228,6 @@ export class LocalRecorder { const f = () => { delete this.blob; this.chunks = []; - this.count = 0; delete this.mediaRecorder; this.state = LocalRecorderState.READY; }; diff --git a/openvidu-browser/src/OpenVidu/OpenVidu.ts b/openvidu-browser/src/OpenVidu/OpenVidu.ts index 55ff8766..06dc353d 100644 --- a/openvidu-browser/src/OpenVidu/OpenVidu.ts +++ b/openvidu-browser/src/OpenVidu/OpenVidu.ts @@ -31,7 +31,6 @@ import * as screenSharing from '../OpenViduInternal/ScreenSharing/Screen-Capturi import RpcBuilder = require('../OpenViduInternal/KurentoUtils/kurento-jsonrpc'); import platform = require('platform'); - platform['isIonicIos'] = (platform.product === 'iPhone' || platform.product === 'iPad') && platform.ua!!.indexOf('Safari') === -1; /** diff --git a/openvidu-browser/src/OpenVidu/Publisher.ts b/openvidu-browser/src/OpenVidu/Publisher.ts index 088545b5..d047456c 100644 --- a/openvidu-browser/src/OpenVidu/Publisher.ts +++ b/openvidu-browser/src/OpenVidu/Publisher.ts @@ -28,6 +28,9 @@ import { VideoElementEvent } from '../OpenViduInternal/Events/VideoElementEvent' import { OpenViduError, OpenViduErrorName } from '../OpenViduInternal/Enums/OpenViduError'; import { VideoInsertMode } from '../OpenViduInternal/Enums/VideoInsertMode'; +import platform = require('platform'); +platform['isIonicIos'] = (platform.product === 'iPhone' || platform.product === 'iPad') && platform.ua!!.indexOf('Safari') === -1; + /** * Packs local media streams. Participants can publish it to a session. Initialized with [[OpenVidu.initPublisher]] method */ diff --git a/openvidu-browser/src/OpenVidu/Session.ts b/openvidu-browser/src/OpenVidu/Session.ts index 331a8108..5da39e6e 100644 --- a/openvidu-browser/src/OpenVidu/Session.ts +++ b/openvidu-browser/src/OpenVidu/Session.ts @@ -41,7 +41,7 @@ import { OpenViduError, OpenViduErrorName } from '../OpenViduInternal/Enums/Open import { VideoInsertMode } from '../OpenViduInternal/Enums/VideoInsertMode'; import EventEmitter = require('wolfy87-eventemitter'); - +import platform = require('platform'); /** * Represents a video call. It can also be seen as a videoconference room where multiple users can connect. diff --git a/openvidu-browser/src/OpenVidu/Stream.ts b/openvidu-browser/src/OpenVidu/Stream.ts index 499478e1..1e118cf1 100644 --- a/openvidu-browser/src/OpenVidu/Stream.ts +++ b/openvidu-browser/src/OpenVidu/Stream.ts @@ -27,10 +27,12 @@ import { WebRtcPeer, WebRtcPeerSendonly, WebRtcPeerRecvonly, WebRtcPeerSendrecv import { WebRtcStats } from '../OpenViduInternal/WebRtcStats/WebRtcStats'; import { PublisherSpeakingEvent } from '../OpenViduInternal/Events/PublisherSpeakingEvent'; import { StreamPropertyChangedEvent } from '../OpenViduInternal/Events/StreamPropertyChangedEvent'; +import { OpenViduError, OpenViduErrorName } from '../OpenViduInternal/Enums/OpenViduError'; import EventEmitter = require('wolfy87-eventemitter'); import hark = require('hark'); -import { OpenViduError, OpenViduErrorName } from '../OpenViduInternal/Enums/OpenViduError'; +import platform = require('platform'); +platform['isIonicIos'] = (platform.product === 'iPhone' || platform.product === 'iPad') && platform.ua!!.indexOf('Safari') === -1; /** diff --git a/openvidu-browser/src/OpenVidu/StreamManager.ts b/openvidu-browser/src/OpenVidu/StreamManager.ts index 64fd06ae..c4078a67 100644 --- a/openvidu-browser/src/OpenVidu/StreamManager.ts +++ b/openvidu-browser/src/OpenVidu/StreamManager.ts @@ -24,7 +24,8 @@ import { VideoElementEvent } from '../OpenViduInternal/Events/VideoElementEvent' import { VideoInsertMode } from '../OpenViduInternal/Enums/VideoInsertMode'; import EventEmitter = require('wolfy87-eventemitter'); - +import platform = require('platform'); +platform['isIonicIos'] = (platform.product === 'iPhone' || platform.product === 'iPad') && platform.ua!!.indexOf('Safari') === -1; /** * Interface in charge of displaying the media streams in the HTML DOM. This wraps any [[Publisher]] and [[Subscriber]] object. diff --git a/openvidu-browser/src/OpenViduInternal/WebRtcPeer/WebRtcPeer.ts b/openvidu-browser/src/OpenViduInternal/WebRtcPeer/WebRtcPeer.ts index c3102df2..fa8ead1b 100644 --- a/openvidu-browser/src/OpenViduInternal/WebRtcPeer/WebRtcPeer.ts +++ b/openvidu-browser/src/OpenViduInternal/WebRtcPeer/WebRtcPeer.ts @@ -17,6 +17,8 @@ import freeice = require('freeice'); import uuid = require('uuid'); +import platform = require('platform'); +platform['isIonicIos'] = (platform.product === 'iPhone' || platform.product === 'iPad') && platform.ua!!.indexOf('Safari') === -1; export interface WebRtcPeerConfiguration { mediaConstraints: { diff --git a/openvidu-browser/src/OpenViduInternal/WebRtcStats/WebRtcStats.ts b/openvidu-browser/src/OpenViduInternal/WebRtcStats/WebRtcStats.ts index 55adbcf4..8f47d5c7 100644 --- a/openvidu-browser/src/OpenViduInternal/WebRtcStats/WebRtcStats.ts +++ b/openvidu-browser/src/OpenViduInternal/WebRtcStats/WebRtcStats.ts @@ -18,6 +18,7 @@ // tslint:disable:no-string-literal import { Stream } from '../../OpenVidu/Stream'; +import platform = require('platform'); export class WebRtcStats {