Skip to content
Snippets Groups Projects
Commit 7f498dad authored by jojohoch's avatar jojohoch
Browse files

[player] Combine the events mediaPlay and mediaPause

parent 585c4224
No related branches found
No related tags found
No related merge requests found
...@@ -8,8 +8,8 @@ import { MediaPlayerElementComponent } from '../media-player-element-component.d ...@@ -8,8 +8,8 @@ import { MediaPlayerElementComponent } from '../media-player-element-component.d
<div [style.width.%]="100" <div [style.width.%]="100"
[style.height.%]="100"> [style.height.%]="100">
<audio #player <audio #player
(playing)="mediaPlay.emit(this.elementModel.id)" (playing)="mediaPlayStatusChanged.emit(this.elementModel.id)"
(pause)="mediaPause.emit(this.elementModel.id)" (pause)="mediaPlayStatusChanged.emit(null)"
[style.width.%]="100" [style.width.%]="100"
[src]="elementModel.src | safeResourceUrl"> [src]="elementModel.src | safeResourceUrl">
</audio> </audio>
......
...@@ -13,6 +13,8 @@ import { MediaPlayerElementComponent } from '../media-player-element-component.d ...@@ -13,6 +13,8 @@ import { MediaPlayerElementComponent } from '../media-player-element-component.d
[src]="elementModel.src | safeResourceUrl"> [src]="elementModel.src | safeResourceUrl">
</video> </video>
<app-control-bar class="correct-position" <app-control-bar class="correct-position"
(playing)="mediaPlayStatusChanged.emit(this.elementModel.id)"
(pause)="mediaPlayStatusChanged.emit(null)"
[player]="player" [player]="player"
[elementModel]="elementModel" [elementModel]="elementModel"
(elementValueChanged)="elementValueChanged.emit($event)"> (elementValueChanged)="elementValueChanged.emit($event)">
......
...@@ -5,8 +5,7 @@ import { ElementComponent } from './element-component.directive'; ...@@ -5,8 +5,7 @@ import { ElementComponent } from './element-component.directive';
@Directive() @Directive()
export abstract class MediaPlayerElementComponent extends ElementComponent { export abstract class MediaPlayerElementComponent extends ElementComponent {
@Output() elementValueChanged = new EventEmitter<ValueChangeElement>(); @Output() elementValueChanged = new EventEmitter<ValueChangeElement>();
@Output() mediaPlay = new EventEmitter<string>(); @Output() mediaPlayStatusChanged = new EventEmitter<string | null>();
@Output() mediaPause = new EventEmitter<string>();
active: boolean = true; active: boolean = true;
......
...@@ -102,19 +102,11 @@ export class ElementContainerComponent implements OnInit { ...@@ -102,19 +102,11 @@ export class ElementContainerComponent implements OnInit {
}); });
} }
if (elementComponent.mediaPause) { if (elementComponent.mediaPlayStatusChanged) {
elementComponent.mediaPause elementComponent.mediaPlayStatusChanged
.pipe(takeUntil(this.ngUnsubscribe)) .pipe(takeUntil(this.ngUnsubscribe))
.subscribe(() => { .subscribe((playStatus: string | null) => {
this.mediaPlayerService.broadCastPlayChanges(null); this.mediaPlayerService.broadCastPlayChanges(playStatus);
});
}
if (elementComponent.mediaPlay) {
elementComponent.mediaPlay
.pipe(takeUntil(this.ngUnsubscribe))
.subscribe((playId: string) => {
this.mediaPlayerService.broadCastPlayChanges(playId);
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment