diff --git a/projects/common/components/media-elements/audio.component.ts b/projects/common/components/media-elements/audio.component.ts index 0cfde342f6a672f12cc0e09e019ff450c3068231..f0d57cbf99862c532cf48f4b1fd0c5fbb60c4259 100644 --- a/projects/common/components/media-elements/audio.component.ts +++ b/projects/common/components/media-elements/audio.component.ts @@ -8,17 +8,17 @@ import { AudioElement } from 'common/models/elements/media-elements/audio'; <div [style.width.%]="100" [style.height.%]="100"> <aspect-media-player-control-bar [player]="player" *ngIf="elementModel.src" - [project]="project" - [id]="elementModel.id" - [savedPlaybackTime]="savedPlaybackTime" - [playerProperties]="elementModel.player" - [active]="active" - [dependencyDissolved]="dependencyDissolved" - (onMediaValidStatusChanged)="onMediaValidStatusChanged.emit($event)" - (elementValueChanged)="elementValueChanged.emit($event)"> + [project]="project" + [id]="elementModel.id" + [savedPlaybackTime]="savedPlaybackTime" + [playerProperties]="elementModel.player" + [active]="active" + [dependencyDissolved]="dependencyDissolved" + (mediaValidStatusChanged)="mediaValidStatusChanged.emit($event)" + (elementValueChanged)="elementValueChanged.emit($event)"> <audio #player - (playing)="onMediaPlayStatusChanged.emit(this.elementModel.id)" - (pause)="onMediaPlayStatusChanged.emit(null)" + (playing)="mediaPlayStatusChanged.emit(this.elementModel.id)" + (pause)="mediaPlayStatusChanged.emit(null)" [style.width.%]="100" [src]="elementModel.src | safeResourceUrl"> </audio> diff --git a/projects/common/components/media-elements/media-player-control-bar/media-player-control-bar.component.ts b/projects/common/components/media-elements/media-player-control-bar/media-player-control-bar.component.ts index 3bd48a697bc7b69f72d0b175206977163c500ea7..c994ed52eea681a0ac1262dd087dd24cb6655ccb 100644 --- a/projects/common/components/media-elements/media-player-control-bar/media-player-control-bar.component.ts +++ b/projects/common/components/media-elements/media-player-control-bar/media-player-control-bar.component.ts @@ -18,7 +18,7 @@ export class MediaPlayerControlBarComponent implements OnInit, OnChanges, OnDest @Input() active!: boolean; @Input() dependencyDissolved!: boolean; @Output() elementValueChanged = new EventEmitter<ValueChangeElement>(); - @Output() onMediaValidStatusChanged = new EventEmitter<string>(); + @Output() mediaValidStatusChanged = new EventEmitter<string>(); duration!: number; currentTime!: number; @@ -110,7 +110,7 @@ export class MediaPlayerControlBarComponent implements OnInit, OnChanges, OnDest private checkValidState(runCounter: number): boolean { this.valid = this.playerProperties.minRuns === 0 ? true : runCounter >= this.playerProperties.minRuns; if (this.valid) { - this.onMediaValidStatusChanged.emit(this.id); + this.mediaValidStatusChanged.emit(this.id); } return this.valid; } diff --git a/projects/common/components/media-elements/video.component.ts b/projects/common/components/media-elements/video.component.ts index ccd27af4056f1644f6b58c49df001ef9560ed3ff..6f6dc3c7bab75b5e690bf805acffc1304b93d0e7 100644 --- a/projects/common/components/media-elements/video.component.ts +++ b/projects/common/components/media-elements/video.component.ts @@ -9,18 +9,18 @@ import { VideoElement } from 'common/models/elements/media-elements/video'; [style.width.%]="100" [style.height.%]="100"> <aspect-media-player-control-bar class="correct-position" *ngIf="elementModel.src" - [player]="player" - [project]="project" - [active]="active" - [id]="elementModel.id" - [savedPlaybackTime]="savedPlaybackTime" - [playerProperties]="elementModel.player" - [dependencyDissolved]="dependencyDissolved" - (onMediaValidStatusChanged)="onMediaValidStatusChanged.emit($event)" - (elementValueChanged)="elementValueChanged.emit($event)"> + [player]="player" + [project]="project" + [active]="active" + [id]="elementModel.id" + [savedPlaybackTime]="savedPlaybackTime" + [playerProperties]="elementModel.player" + [dependencyDissolved]="dependencyDissolved" + (mediaValidStatusChanged)="mediaValidStatusChanged.emit($event)" + (elementValueChanged)="elementValueChanged.emit($event)"> <video #player - (playing)="onMediaPlayStatusChanged.emit(this.elementModel.id)" - (pause)="onMediaPlayStatusChanged.emit(null)" + (playing)="mediaPlayStatusChanged.emit(this.elementModel.id)" + (pause)="mediaPlayStatusChanged.emit(null)" [style.width.%]="100" [src]="elementModel.src | safeResourceUrl"> </video> diff --git a/projects/common/directives/media-player-element-component.directive.ts b/projects/common/directives/media-player-element-component.directive.ts index 95dedcc13ef2a7a985ef2d07fa2f3ccbb060f4da..de525feb42cbab1cd0df6b466e762da5a3602e39 100644 --- a/projects/common/directives/media-player-element-component.directive.ts +++ b/projects/common/directives/media-player-element-component.directive.ts @@ -14,8 +14,8 @@ export abstract class MediaPlayerElementComponent extends ElementComponent imple @Input() actualPlayingId!: Subject<string | null>; @Input() mediaStatusChanged!: Subject<string>; @Output() elementValueChanged = new EventEmitter<ValueChangeElement>(); - @Output() onMediaPlayStatusChanged = new EventEmitter<string | null>(); - @Output() onMediaValidStatusChanged = new EventEmitter<string>(); + @Output() mediaPlayStatusChanged = new EventEmitter<string | null>(); + @Output() mediaValidStatusChanged = new EventEmitter<string>(); abstract elementModel: AudioElement | VideoElement; active: boolean = true; diff --git a/projects/player/src/app/components/elements/media-player-group-element/media-player-group-element.component.html b/projects/player/src/app/components/elements/media-player-group-element/media-player-group-element.component.html index 8e389069ff2224fb2fe12c091510e56b302581b1..f0bed2d0cdee78b34942119411df60010356ec6b 100644 --- a/projects/player/src/app/components/elements/media-player-group-element/media-player-group-element.component.html +++ b/projects/player/src/app/components/elements/media-player-group-element/media-player-group-element.component.html @@ -5,8 +5,8 @@ [savedPlaybackTime]="initialValue" [actualPlayingId]="mediaPlayerService.actualPlayingId" [mediaStatusChanged]="mediaPlayerService.mediaStatusChanged" - (onMediaValidStatusChanged)="mediaPlayerService.setValidStatusChanged($event)" - (onMediaPlayStatusChanged)="mediaPlayerService.setActualPlayingId($event)" + (mediaValidStatusChanged)="mediaPlayerService.setValidStatusChanged($event)" + (mediaPlayStatusChanged)="mediaPlayerService.setActualPlayingId($event)" (elementValueChanged)="unitStateService.changeElementCodeValue($event)"> </aspect-audio> @@ -17,7 +17,7 @@ [actualPlayingId]="mediaPlayerService.actualPlayingId" [mediaStatusChanged]="mediaPlayerService.mediaStatusChanged" [savedPlaybackTime]="initialValue" - (onMediaValidStatusChanged)="mediaPlayerService.setValidStatusChanged($event)" - (onMediaPlayStatusChanged)="mediaPlayerService.setActualPlayingId($event)" + (mediaValidStatusChanged)="mediaPlayerService.setValidStatusChanged($event)" + (mediaPlayStatusChanged)="mediaPlayerService.setActualPlayingId($event)" (elementValueChanged)="unitStateService.changeElementCodeValue($event)"> </aspect-video>