flan/advanced-camera-card
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix issue where wrong ha stream may be referred to [skip ci] (#1760)

Browse Source
This commit is contained in:
Dermot Duffy
2024-12-14 17:53:47 -08:00
committed by GitHub
parent 67f03fb370
commit b6fb821074
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/patches/ha-camera-stream.ts
+3 -5
View File
@@ -44,7 +44,7 @@ customElements.whenDefined('ha-camera-stream').then(() => {
{ {
// Due to an obscure behavior when this card is casted, this element needs // Due to an obscure behavior when this card is casted, this element needs
// to use query rather than the ref directive to find the player. // to use query rather than the ref directive to find the player.
@query('#player') @query('.player:not(.hidden)')
protected _player: FrigateCardMediaPlayer; protected _player: FrigateCardMediaPlayer;
protected _mediaLoadedInfoPerStream: Record<StreamType, MediaLoadedInfo> = {}; protected _mediaLoadedInfoPerStream: Record<StreamType, MediaLoadedInfo> = {};
@@ -130,7 +130,6 @@ customElements.whenDefined('ha-camera-stream').then(() => {
if (stream.type === STREAM_TYPE_HLS) { if (stream.type === STREAM_TYPE_HLS) {
return html` <frigate-card-ha-hls-player return html` <frigate-card-ha-hls-player
id="player"
?autoplay=${false} ?autoplay=${false}
playsinline playsinline
.allowExoPlayer=${this.allowExoPlayer} .allowExoPlayer=${this.allowExoPlayer}
@@ -142,13 +141,12 @@ customElements.whenDefined('ha-camera-stream').then(() => {
@frigate-card:media:loaded=${(ev) => @frigate-card:media:loaded=${(ev) =>
this._storeMediaLoadedInfoHandler(STREAM_TYPE_HLS, ev)} this._storeMediaLoadedInfoHandler(STREAM_TYPE_HLS, ev)}
@streams=${this._handleHlsStreams} @streams=${this._handleHlsStreams}
class=${stream.visible ? '' : 'hidden'} class="player ${stream.visible ? '' : 'hidden'}"
></frigate-card-ha-hls-player>`; ></frigate-card-ha-hls-player>`;
} }
if (stream.type === STREAM_TYPE_WEB_RTC) { if (stream.type === STREAM_TYPE_WEB_RTC) {
return html`<frigate-card-ha-web-rtc-player return html`<frigate-card-ha-web-rtc-player
id="player"
?autoplay=${false} ?autoplay=${false}
playsinline playsinline
.muted=${this.muted} .muted=${this.muted}
@@ -159,7 +157,7 @@ customElements.whenDefined('ha-camera-stream').then(() => {
@frigate-card:media:loaded=${(ev) => @frigate-card:media:loaded=${(ev) =>
this._storeMediaLoadedInfoHandler(STREAM_TYPE_WEB_RTC, ev)} this._storeMediaLoadedInfoHandler(STREAM_TYPE_WEB_RTC, ev)}
@streams=${this._handleWebRtcStreams} @streams=${this._handleWebRtcStreams}
class=${stream.visible ? '' : 'hidden'} class="player ${stream.visible ? '' : 'hidden'}"
></frigate-card-ha-web-rtc-player>`; ></frigate-card-ha-web-rtc-player>`;
} }