Oops! Camera and microphone are not available
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/models/participant.model.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/models/participant.model.ts
index 7c4c03fe..7a75c7f3 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/models/participant.model.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/models/participant.model.ts
@@ -12,7 +12,7 @@ export interface StreamModel {
}
export abstract class ParticipantAbstractModel {
- connections: Map = new Map();
+ streams: Map = new Map();
id: string;
constructor(model?: StreamModel, id?: string) {
@@ -25,12 +25,12 @@ export abstract class ParticipantAbstractModel {
videoEnlarged: model ? model.videoEnlarged : false,
connectionId: model ? model.connectionId : null
};
- this.connections.set(streamModel.type, streamModel);
+ this.streams.set(streamModel.type, streamModel);
this.id = id ? id : new Date().getTime().toString();
}
addConnection(streamModel: StreamModel) {
- this.connections.set(streamModel.type, streamModel);
+ this.streams.set(streamModel.type, streamModel);
}
public isCameraAudioActive(): boolean {
@@ -48,15 +48,15 @@ export abstract class ParticipantAbstractModel {
}
hasConnectionType(type: VideoType): boolean {
- return this.connections.has(type);
+ return this.streams.has(type);
}
public getCameraConnection(): StreamModel {
- return this.connections.get(VideoType.CAMERA);
+ return this.streams.get(VideoType.CAMERA);
}
public getScreenConnection(): StreamModel {
- return this.connections.get(VideoType.SCREEN);
+ return this.streams.get(VideoType.SCREEN);
}
getConnectionTypesEnabled(): VideoType[] {
@@ -75,27 +75,27 @@ export abstract class ParticipantAbstractModel {
}
removeConnection(connectionId: string) {
- this.connections.delete(this.getConnectionById(connectionId).type);
+ this.streams.delete(this.getConnectionById(connectionId).type);
}
hasConnectionId(connectionId: string): boolean {
- return Array.from(this.connections.values()).some((conn) => conn.connectionId === connectionId);
+ return Array.from(this.streams.values()).some((conn) => conn.connectionId === connectionId);
}
getConnectionById(connectionId: string): StreamModel {
- return Array.from(this.connections.values()).find((conn) => conn.connectionId === connectionId);
+ return Array.from(this.streams.values()).find((conn) => conn.connectionId === connectionId);
}
getAvailableConnections(): StreamModel[] {
- return Array.from(this.connections.values()).filter((conn) => conn.connected);
+ return Array.from(this.streams.values()).filter((conn) => conn.connected);
}
isLocal(): boolean {
- return Array.from(this.connections.values()).every((conn) => conn.local);
+ return Array.from(this.streams.values()).every((conn) => conn.local);
}
setNickname(nickname: string) {
- this.connections.forEach((conn) => {
+ this.streams.forEach((conn) => {
if (conn.type === VideoType.CAMERA) {
conn.nickname = nickname;
} else {
@@ -123,7 +123,7 @@ export abstract class ParticipantAbstractModel {
}
setPublisher(connType: VideoType, publisher: StreamManager) {
- const connection = this.connections.get(connType);
+ const connection = this.streams.get(connType);
if(connection) {
connection.streamManager = publisher;
}
@@ -157,11 +157,11 @@ export abstract class ParticipantAbstractModel {
if (screenConnection) screenConnection.connected = false;
}
setAllVideoEnlarged(enlarged: boolean) {
- this.connections.forEach((conn) => (conn.videoEnlarged = enlarged));
+ this.streams.forEach((conn) => (conn.videoEnlarged = enlarged));
}
toggleVideoEnlarged(connectionId: string) {
- this.connections.forEach((conn) => {
+ this.streams.forEach((conn) => {
if (conn.connectionId === connectionId) {
conn.videoEnlarged = !conn.videoEnlarged;
}
@@ -169,7 +169,7 @@ export abstract class ParticipantAbstractModel {
}
someHasVideoEnlarged(): boolean {
- return Array.from(this.connections.values()).some((conn) => conn.videoEnlarged);
+ return Array.from(this.streams.values()).some((conn) => conn.videoEnlarged);
}
}
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
index 34019121..49641f00 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.module.ts
@@ -37,7 +37,7 @@ import { DialogTemplateComponent } from './components/material/dialog.component'
import { LinkifyPipe } from './pipes/linkify.pipe';
import { TooltipListPipe } from './pipes/tooltip-list.pipe';
-import { ConnectionsEnabledPipe, NicknamePipe, ParticipantConnectionsPipe } from './pipes/participant-connections.pipe';
+import { StreamsEnabledPipe, NicknamePipe, ParticipantStreamsPipe } from './pipes/participant.pipe';
import { LibConfig } from './config/lib.config';
import { CdkOverlayContainer } from './config/custom-cdk-overlay';
@@ -64,7 +64,6 @@ import { AudioWaveComponent } from './components/audio-wave/audio-wave.component
@NgModule({
declarations: [
StreamDirective,
-
UserSettingsComponent,
VideoComponent,
ToolbarComponent,
@@ -75,8 +74,8 @@ import { AudioWaveComponent } from './components/audio-wave/audio-wave.component
DialogTemplateComponent,
LinkifyPipe,
TooltipListPipe,
- ParticipantConnectionsPipe,
- ConnectionsEnabledPipe,
+ ParticipantStreamsPipe,
+ StreamsEnabledPipe,
NicknamePipe,
ParticipantItemComponent,
ParticipantsPanelComponent,
@@ -137,7 +136,7 @@ import { AudioWaveComponent } from './components/audio-wave/audio-wave.component
StreamComponent,
VideoComponent,
AudioWaveComponent,
- ParticipantConnectionsPipe,
+ ParticipantStreamsPipe,
CommonModule,
StreamDirective
],
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/pipes/participant-connections.pipe.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/pipes/participant.pipe.ts
similarity index 64%
rename from openvidu-components-angular/projects/openvidu-angular/src/lib/pipes/participant-connections.pipe.ts
rename to openvidu-components-angular/projects/openvidu-angular/src/lib/pipes/participant.pipe.ts
index 87db658e..32c42364 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/pipes/participant-connections.pipe.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/pipes/participant.pipe.ts
@@ -1,25 +1,25 @@
import { Pipe, PipeTransform } from '@angular/core';
import { StreamModel, ParticipantAbstractModel } from '../models/participant.model';
-@Pipe({ name: 'connections' })
-export class ParticipantConnectionsPipe implements PipeTransform {
+@Pipe({ name: 'streams' })
+export class ParticipantStreamsPipe implements PipeTransform {
constructor() {}
transform(participants: ParticipantAbstractModel[] | ParticipantAbstractModel): StreamModel[] {
- let connections: StreamModel[] = [];
+ let streams: StreamModel[] = [];
if (Array.isArray(participants)) {
participants.forEach((p) => {
- connections = connections.concat(Array.from(p.connections.values()));
+ streams = streams.concat(Array.from(p.streams.values()));
});
} else {
- connections = Array.from(participants.connections.values());
+ streams = Array.from(participants.streams.values());
}
- return connections;
+ return streams;
}
}
-@Pipe({ name: 'connectionsEnabled', pure: false })
-export class ConnectionsEnabledPipe implements PipeTransform {
+@Pipe({ name: 'streamsEnabled', pure: false })
+export class StreamsEnabledPipe implements PipeTransform {
constructor() {}
transform(participant: ParticipantAbstractModel): string {
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts
index a9792fe7..a3a4e722 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/participant/participant.service.ts
@@ -198,7 +198,7 @@ export class ParticipantService {
let participantsWithConnectionAvailable: ParticipantAbstractModel = Object.assign(this.newParticipant(), this.localParticipant);
const availableConnections = participantsWithConnectionAvailable.getAvailableConnections();
const availableConnectionsMap = new Map(availableConnections.map((conn) => [conn.type, conn]));
- participantsWithConnectionAvailable.connections = availableConnectionsMap;
+ participantsWithConnectionAvailable.streams = availableConnectionsMap;
this._localParticipant.next(participantsWithConnectionAvailable);
}
@@ -249,7 +249,7 @@ export class ParticipantService {
if (participant) {
participant.removeConnection(connectionId);
//TODO: Timeout of X seconds?? Its possible sometimes the connections map was empty but must not be deleted
- if (participant.connections.size === 0) {
+ if (participant.streams.size === 0) {
// Remove participants without connections
this.remoteParticipants = this.remoteParticipants.filter((p) => p !== participant);
}
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts b/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts
index 0e86b561..e6a38ab2 100644
--- a/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts
+++ b/openvidu-components-angular/projects/openvidu-angular/src/public-api.ts
@@ -40,7 +40,7 @@ export * from './lib/models/video-type.model';
export * from './lib/models/notification-options.model';
// Pipes
-export * from './lib/pipes/participant-connections.pipe';
+export * from './lib/pipes/participant.pipe';
// Directives
export * from './lib/directives/stream/stream.directive';
\ No newline at end of file