From 8dec3418c95167c9c5b0099c5232c7c88d87c791 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Thu, 22 May 2025 11:10:02 -0600
Subject: [PATCH] Birdseye config updates

---
 frigate/comms/dispatcher.py | 14 ++++++++++++--
 frigate/output/birdseye.py  | 17 -----------------
 frigate/output/output.py    |  7 ++++++-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py
index 65985b326..de3039812 100644
--- a/frigate/comms/dispatcher.py
+++ b/frigate/comms/dispatcher.py
@@ -485,6 +485,10 @@ class Dispatcher:
                 logger.info(f"Turning off snapshots for {camera_name}")
                 snapshots_settings.enabled = False
 
+        self.config_updater.publish_update(
+            CameraConfigUpdateTopic(CameraConfigUpdateEnum.snapshots, camera_name),
+            snapshots_settings,
+        )
         self.publish(f"{camera_name}/snapshots/state", payload, retain=True)
 
     def _on_ptz_command(self, camera_name: str, payload: str) -> None:
@@ -519,7 +523,10 @@ class Dispatcher:
                 logger.info(f"Turning off birdseye for {camera_name}")
                 birdseye_settings.enabled = False
 
-        self.config_updater.publish(f"config/birdseye/{camera_name}", birdseye_settings)
+        self.config_updater.publish_update(
+            CameraConfigUpdateTopic(CameraConfigUpdateEnum.birdseye, camera_name),
+            birdseye_settings,
+        )
         self.publish(f"{camera_name}/birdseye/state", payload, retain=True)
 
     def _on_birdseye_mode_command(self, camera_name: str, payload: str) -> None:
@@ -540,7 +547,10 @@ class Dispatcher:
             f"Setting birdseye mode for {camera_name} to {birdseye_settings.mode}"
         )
 
-        self.config_updater.publish(f"config/birdseye/{camera_name}", birdseye_settings)
+        self.config_updater.publish_update(
+            CameraConfigUpdateTopic(CameraConfigUpdateEnum.birdseye, camera_name),
+            birdseye_settings,
+        )
         self.publish(f"{camera_name}/birdseye_mode/state", payload, retain=True)
 
     def _on_camera_notification_command(self, camera_name: str, payload: str) -> None:
diff --git a/frigate/output/birdseye.py b/frigate/output/birdseye.py
index b295af82e..78686fd63 100644
--- a/frigate/output/birdseye.py
+++ b/frigate/output/birdseye.py
@@ -15,7 +15,6 @@ from typing import Any, Optional
 import cv2
 import numpy as np
 
-from frigate.comms.config_updater import ConfigSubscriber
 from frigate.config import BirdseyeModeEnum, FfmpegConfig, FrigateConfig
 from frigate.const import BASE_DIR, BIRDSEYE_PIPE, INSTALL_DIR
 from frigate.util.image import (
@@ -754,7 +753,6 @@ class Birdseye:
             "birdseye", self.converter, websocket_server, stop_event
         )
         self.birdseye_manager = BirdsEyeFrameManager(config, stop_event)
-        self.birdseye_subscriber = ConfigSubscriber("config/birdseye/")
         self.frame_manager = SharedMemoryFrameManager()
         self.stop_event = stop_event
 
@@ -791,20 +789,6 @@ class Birdseye:
         frame_time: float,
         frame: np.ndarray,
     ) -> None:
-        # check if there is an updated config
-        while True:
-            (
-                updated_birdseye_topic,
-                updated_birdseye_config,
-            ) = self.birdseye_subscriber.check_for_update()
-
-            if not updated_birdseye_topic:
-                break
-
-            if updated_birdseye_config:
-                camera_name = updated_birdseye_topic.rpartition("/")[-1]
-                self.config.cameras[camera_name].birdseye = updated_birdseye_config
-
         if self.birdseye_manager.update(
             camera,
             len([o for o in current_tracked_objects if not o["stationary"]]),
@@ -815,6 +799,5 @@ class Birdseye:
             self.__send_new_frame()
 
     def stop(self) -> None:
-        self.birdseye_subscriber.stop()
         self.converter.join()
         self.broadcaster.join()
diff --git a/frigate/output/output.py b/frigate/output/output.py
index 6be6db226..6decf0005 100644
--- a/frigate/output/output.py
+++ b/frigate/output/output.py
@@ -103,7 +103,12 @@ def output_frames(
 
     detection_subscriber = DetectionSubscriber(DetectionTypeEnum.video)
     config_subscriber = CameraConfigUpdateSubscriber(
-        config.cameras, [CameraConfigUpdateEnum.enabled, CameraConfigUpdateEnum.record]
+        config.cameras,
+        [
+            CameraConfigUpdateEnum.birdseye,
+            CameraConfigUpdateEnum.enabled,
+            CameraConfigUpdateEnum.record,
+        ],
     )
 
     jsmpeg_cameras: dict[str, JsmpegCamera] = {}