From 3a9048cc62c898e59a2de81a74264350a858949b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 26 Sep 2026 01:30:16 +0100
Subject: [PATCH] [speaker_source] Use register_apply_action for
 speaker_source.set_playlist_delay (#19686)

---
 .../components/speaker_source/automation.h    | 29 ------------------
 .../components/speaker_source/media_player.py | 30 ++++---------------
 2 files changed, 5 insertions(+), 54 deletions(-)
 delete mode 100644 esphome/components/speaker_source/automation.h

diff --git a/esphome/components/speaker_source/automation.h b/esphome/components/speaker_source/automation.h
deleted file mode 100644
index a03fa42477..0000000000
--- a/esphome/components/speaker_source/automation.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-
-#ifdef USE_ESP32
-
-#include "esphome/core/automation.h"
-#include "speaker_source_media_player.h"
-
-namespace esphome::speaker_source {
-
-template<typename... Ts> class SetPlaylistDelayAction final : public Action<Ts...> {
- public:
-  explicit SetPlaylistDelayAction(SpeakerSourceMediaPlayer *parent) : parent_(parent) {}
-
-  TEMPLATABLE_VALUE(uint8_t, pipeline)
-  TEMPLATABLE_VALUE(uint32_t, delay)
-
-  void play(const Ts &...x) override {
-    this->parent_->set_playlist_delay_ms(this->pipeline_.value(x...), this->delay_.value(x...));
-  }
-
- protected:
-  SpeakerSourceMediaPlayer *parent_;
-};
-
-}  // namespace esphome::speaker_source
-
-#endif  // USE_ESP32
diff --git a/esphome/components/speaker_source/media_player.py b/esphome/components/speaker_source/media_player.py
index b6653fe543..4f150e87ff 100644
--- a/esphome/components/speaker_source/media_player.py
+++ b/esphome/components/speaker_source/media_player.py
@@ -16,8 +16,6 @@ from esphome.const import (
     CONF_SAMPLE_RATE,
     CONF_SPEAKER,
 )
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 AUTO_LOAD = ["audio"]
@@ -59,10 +57,6 @@ _PIPELINE_INFO = {
     ),
 }
 
-SetPlaylistDelayAction = speaker_source_ns.class_(
-    "SetPlaylistDelayAction", automation.Action
-)
-
 
 _validate_pipeline = media_player.validate_preferred_format(
     "speaker_source media_player", CONF_SPEAKER
@@ -232,25 +226,11 @@ SET_PLAYLIST_DELAY_ACTION_SCHEMA = cv.Schema(
 )
 
 
-@automation.register_action(
+automation.register_apply_action(
     "speaker_source.set_playlist_delay",
-    SetPlaylistDelayAction,
     SET_PLAYLIST_DELAY_ACTION_SCHEMA,
-    synchronous=True,
+    automation.ApplyCall(
+        "set_playlist_delay_ms({}, {})",
+        ((CONF_PIPELINE, cg.uint8), (CONF_DELAY, cg.uint32)),
+    ),
 )
-async def set_playlist_delay_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    parent = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, parent)
-
-    template_ = await cg.templatable(config[CONF_PIPELINE], args, cg.uint8)
-    cg.add(var.set_pipeline(template_))
-
-    template_ = await cg.templatable(config[CONF_DELAY], args, cg.uint32)
-    cg.add(var.set_delay(template_))
-
-    return var