Move all live provider options into cameras.

src/components/live/live-image.ts

@@ -2,7 +2,7 @@ import { HomeAssistant } from 'custom-card-helpers';
 import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import liveImageStyle from '../../scss/live-image.scss';
-import { CameraConfig, FrigateCardMediaPlayer, LiveImageConfig } from '../../types.js';
+import { CameraConfig, FrigateCardMediaPlayer } from '../../types.js';
 import { getStateObjOrDispatchError } from './live.js';
 import '../image.js';
 
@@ -14,9 +14,6 @@ export class FrigateCardLiveImage extends LitElement implements FrigateCardMedia
   @property({ attribute: false })
   public cameraConfig?: CameraConfig;
 
-  @property({ attribute: false })
-  public liveImageConfig?: LiveImageConfig;
-
   @state()
   protected _playing = true;
 
@@ -46,7 +43,7 @@ export class FrigateCardLiveImage extends LitElement implements FrigateCardMedia
   }
 
   protected render(): TemplateResult | void {
-    if (!this.hass || !this.liveImageConfig) {
+    if (!this.hass || !this.cameraConfig) {
       return;
     }
 
@@ -55,7 +52,7 @@ export class FrigateCardLiveImage extends LitElement implements FrigateCardMedia
     return html` <frigate-card-image
       .imageConfig=${{
         mode: 'camera' as const,
-        refresh_seconds: this._playing ? this.liveImageConfig.refresh_seconds : 0,
+        refresh_seconds: this._playing ? this.cameraConfig.image.refresh_seconds : 0,
         // Don't need to pass layout options as FrigateCardLiveProvider has
         // already taken care of this for us.
       }}

src/components/live/live-jsmpeg.ts

@@ -10,11 +10,9 @@ import {
   CardWideConfig,
   ExtendedHomeAssistant,
   FrigateCardMediaPlayer,
-  JSMPEGConfig,
 } from '../../types.js';
 import { dispatchMediaLoadedEvent } from '../../utils/media-info.js';
 import { dispatchErrorMessageEvent } from '../message.js';
-import { contentsChanged } from '../../utils/basic.js';
 import { CameraEndpoints } from '../../camera-manager/types.js';
 import { getEndpointAddressOrDispatchError } from '../../utils/endpoint.js';
 
@@ -32,9 +30,6 @@ export class FrigateCardLiveJSMPEG extends LitElement implements FrigateCardMedi
   @property({ attribute: false })
   public cameraEndpoints?: CameraEndpoints;
 
-  @property({ attribute: false, hasChanged: contentsChanged })
-  public jsmpegConfig?: JSMPEGConfig;
-
   @property({ attribute: false })
   public cardWideConfig?: CardWideConfig;
 
@@ -99,7 +94,7 @@ export class FrigateCardLiveJSMPEG extends LitElement implements FrigateCardMedi
           videoBufferSize: 1024 * 1024 * 4,
 
           // Override with user-specified options.
-          ...this.jsmpegConfig?.options,
+          ...this.cameraConfig?.jsmpeg?.options,
 
           // Don't allow the player to internally reconnect, as it may re-use a
           // URL with a (newly) invalid signature, e.g. during a Home Assistant

src/components/live/live-webrtc-card.ts

@@ -9,9 +9,7 @@ import {
   CardWideConfig,
   FrigateCardError,
   FrigateCardMediaPlayer,
-  WebRTCCardConfig,
 } from '../../types.js';
-import { contentsChanged } from '../../utils/basic.js';
 import { dispatchMediaLoadedEvent } from '../../utils/media-info.js';
 import { dispatchErrorMessageEvent, renderProgressIndicator } from '../message.js';
 import { renderTask } from '../../utils/task.js';
@@ -27,9 +25,6 @@ export class FrigateCardLiveWebRTCCard
   extends LitElement
   implements FrigateCardMediaPlayer
 {
-  @property({ attribute: false, hasChanged: contentsChanged })
-  public webRTCConfig?: WebRTCCardConfig;
-
   @property({ attribute: false })
   public cameraConfig?: CameraConfig;
 
@@ -95,23 +90,12 @@ export class FrigateCardLiveWebRTCCard
   protected _createWebRTC(): HTMLElement | null {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const webrtcElement = this._webrtcTask.value;
-    if (webrtcElement && this.hass) {
+    if (webrtcElement && this.hass && this.cameraConfig?.webrtc_card) {
       const webrtc = new webrtcElement() as HTMLElement & {
         hass: HomeAssistant;
         setConfig: (config: Record<string, unknown>) => void;
       };
-      const config = { ...this.webRTCConfig };
-
-      // If the live WebRTC configuration does not specify a URL/entity to use,
-      // then take values from the camera configuration instead (if there are
-      // any).
-      if (!config.url) {
-        config.url = this.cameraConfig?.webrtc_card?.url;
-      }
-      if (!config.entity) {
-        config.entity = this.cameraConfig?.webrtc_card?.entity;
-      }
-      webrtc.setConfig(config);
+      webrtc.setConfig(this.cameraConfig.webrtc_card);
       webrtc.hass = this.hass;
       return webrtc;
     }

src/components/live/live.ts

@@ -861,7 +861,6 @@ export class FrigateCardLiveProvider
             ${ref(this._providerRef)}
             .hass=${this.hass}
             .cameraConfig=${this.cameraConfig}
-            .liveImageConfig=${this.liveConfig.image}
             @frigate-card:media:loaded=${() => {
               if (provider === 'image') {
                 // Only count the media has loaded if the required provider is
@@ -898,7 +897,6 @@ export class FrigateCardLiveProvider
             class=${classMap(providerClasses)}
             .hass=${this.hass}
             .cameraConfig=${this.cameraConfig}
-            .webRTCConfig=${this.liveConfig.webrtc_card}
             .cardWideConfig=${this.cardWideConfig}
             @frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)}
           >
@@ -910,7 +908,6 @@ export class FrigateCardLiveProvider
             .hass=${this.hass}
             .cameraConfig=${this.cameraConfig}
             .cameraEndpoints=${this.cameraEndpoints}
-            .jsmpegConfig=${this.liveConfig.jsmpeg}
             .cardWideConfig=${this.cardWideConfig}
             @frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)}
           >