From e4060e0f8062a876970f39ecf1eba53e0b37f8cf Mon Sep 17 00:00:00 2001
From: jojohoch <joachim.hoch@iqb.hu-berlin.de>
Date: Thu, 28 Apr 2022 15:59:16 +0200
Subject: [PATCH] [player] Rename properties and methods in MediaPlayerService
---
.../element-media-player-group.component.html | 4 ++--
.../src/app/services/media-player.service.ts | 19 ++++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/projects/player/src/app/components/element-media-player-group/element-media-player-group.component.html b/projects/player/src/app/components/element-media-player-group/element-media-player-group.component.html
index 90c163427..8e389069f 100644
--- a/projects/player/src/app/components/element-media-player-group/element-media-player-group.component.html
+++ b/projects/player/src/app/components/element-media-player-group/element-media-player-group.component.html
@@ -6,7 +6,7 @@
[actualPlayingId]="mediaPlayerService.actualPlayingId"
[mediaStatusChanged]="mediaPlayerService.mediaStatusChanged"
(onMediaValidStatusChanged)="mediaPlayerService.setValidStatusChanged($event)"
- (onMediaPlayStatusChanged)="mediaPlayerService.setActualPlayingMediaId($event)"
+ (onMediaPlayStatusChanged)="mediaPlayerService.setActualPlayingId($event)"
(elementValueChanged)="unitStateService.changeElementCodeValue($event)">
</aspect-audio>
@@ -18,6 +18,6 @@
[mediaStatusChanged]="mediaPlayerService.mediaStatusChanged"
[savedPlaybackTime]="initialValue"
(onMediaValidStatusChanged)="mediaPlayerService.setValidStatusChanged($event)"
- (onMediaPlayStatusChanged)="mediaPlayerService.setActualPlayingMediaId($event)"
+ (onMediaPlayStatusChanged)="mediaPlayerService.setActualPlayingId($event)"
(elementValueChanged)="unitStateService.changeElementCodeValue($event)">
</aspect-video>
diff --git a/projects/player/src/app/services/media-player.service.ts b/projects/player/src/app/services/media-player.service.ts
index f9686704d..a234bbb94 100644
--- a/projects/player/src/app/services/media-player.service.ts
+++ b/projects/player/src/app/services/media-player.service.ts
@@ -5,31 +5,32 @@ import { Subject } from 'rxjs';
providedIn: 'root'
})
export class MediaPlayerService {
- mediaElements: { id: string; valid: boolean }[] = []; // TODO besser isValid
mediaStatusChanged = new Subject<string>();
actualPlayingId: Subject<string | null> = new Subject();
+ private mediaElements: { id: string; isValid: boolean }[] = [];
+
get mediaStatus(): string {
- const validMediaElements = this.mediaElements.filter(mediaElement => mediaElement.valid);
+ const validMediaElements = this.mediaElements.filter(mediaElement => mediaElement.isValid);
if (validMediaElements.length) {
return validMediaElements.length === this.mediaElements.length ? 'complete' : 'some';
}
return this.mediaElements.length ? 'none' : 'complete';
}
- registerMediaElement(id: string, valid: boolean): void {
- this.mediaElements.push({ id, valid });
+ registerMediaElement(id: string, isValid: boolean): void {
+ this.mediaElements.push({ id, isValid });
}
- setActualPlayingMediaId(actualId: string | null): void {
+ setActualPlayingId(actualId: string | null): void {
this.actualPlayingId.next(actualId);
}
- setValidStatusChanged(validId: string): void { // TODO validId? komischer name
- const validMediaElement = this.mediaElements.find(mediaElement => mediaElement.id === validId);
+ setValidStatusChanged(validMediaId: string): void {
+ const validMediaElement = this.mediaElements.find(mediaElement => mediaElement.id === validMediaId);
if (validMediaElement) {
- validMediaElement.valid = true;
- this.mediaStatusChanged.next(validId);
+ validMediaElement.isValid = true;
+ this.mediaStatusChanged.next(validMediaId);
}
}
--
GitLab