From d43189cb076b74ce0085c084adf414ffef726df8 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 28 Nov 2025 12:14:19 -0600 Subject: [PATCH 1/2] Update esphome/components/camera/camera.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- esphome/components/camera/camera.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esphome/components/camera/camera.h b/esphome/components/camera/camera.h index a4f33de00bc..9f46eb0c438 100644 --- a/esphome/components/camera/camera.h +++ b/esphome/components/camera/camera.h @@ -102,7 +102,7 @@ struct CameraImageSpec { }; /** Abstract camera base class. Collaborates with API. - * 1) API server starts and registers as a listener (add_image_listener) + * 1) API server starts and registers as a listener (add_listener) * to receive new images from the camera. * 2) New API client connects and creates a new image reader (create_image_reader). * 3) API connection receives protobuf CameraImageRequest and calls request_image. From b872d105832e5aa774906fd8cf7eac2296efb1d3 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Fri, 28 Nov 2025 16:52:46 -0600 Subject: [PATCH 2/2] simplify --- esphome/components/camera/camera.h | 2 +- esphome/components/esp32_camera/esp32_camera.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/esphome/components/camera/camera.h b/esphome/components/camera/camera.h index 9f46eb0c438..6e1fc8cc06b 100644 --- a/esphome/components/camera/camera.h +++ b/esphome/components/camera/camera.h @@ -45,7 +45,7 @@ class CameraImage; */ class CameraListener { public: - virtual void on_camera_image(const std::shared_ptr &image) = 0; + virtual void on_camera_image(const std::shared_ptr &image) {} virtual void on_stream_start() {} virtual void on_stream_stop() {} }; diff --git a/esphome/components/esp32_camera/esp32_camera.h b/esphome/components/esp32_camera/esp32_camera.h index 96b11db65c8..54a7d6064a2 100644 --- a/esphome/components/esp32_camera/esp32_camera.h +++ b/esphome/components/esp32_camera/esp32_camera.h @@ -232,14 +232,12 @@ class ESP32CameraImageTrigger : public Trigger, public camera:: class ESP32CameraStreamStartTrigger : public Trigger<>, public camera::CameraListener { public: explicit ESP32CameraStreamStartTrigger(ESP32Camera *parent) { parent->add_listener(this); } - void on_camera_image(const std::shared_ptr &image) override {} void on_stream_start() override { this->trigger(); } }; class ESP32CameraStreamStopTrigger : public Trigger<>, public camera::CameraListener { public: explicit ESP32CameraStreamStopTrigger(ESP32Camera *parent) { parent->add_listener(this); } - void on_camera_image(const std::shared_ptr &image) override {} void on_stream_stop() override { this->trigger(); } };