1
0
mirror of https://github.com/esphome/esphome.git synced 2025-11-16 06:45:48 +00:00

Merge branch 'speaker_automation' into integration

This commit is contained in:
J. Nick Koston
2025-11-08 23:47:22 -06:00

View File

@@ -12,32 +12,30 @@ template<typename... Ts> class PlayAction : public Action<Ts...>, public Parente
public: public:
void set_data_template(std::vector<uint8_t> (*func)(Ts...)) { void set_data_template(std::vector<uint8_t> (*func)(Ts...)) {
this->data_.func = func; this->data_.func = func;
this->static_ = false; this->len_ = -1; // Sentinel value indicates template mode
} }
void set_data_static(const uint8_t *data, size_t len) { void set_data_static(const uint8_t *data, size_t len) {
this->data_.static_data.ptr = data; this->data_.data = data;
this->data_.static_data.len = len; this->len_ = len; // Length >= 0 indicates static mode
this->static_ = true;
} }
void play(const Ts &...x) override { void play(const Ts &...x) override {
if (this->static_) { if (this->len_ >= 0) {
this->parent_->play(this->data_.static_data.ptr, this->data_.static_data.len); // Static mode: pass pointer directly to play(const uint8_t *, size_t)
this->parent_->play(this->data_.data, static_cast<size_t>(this->len_));
} else { } else {
// Template mode: call function and pass vector to play(const std::vector<uint8_t> &)
auto val = this->data_.func(x...); auto val = this->data_.func(x...);
this->parent_->play(val); this->parent_->play(val);
} }
} }
protected: protected:
bool static_{true}; ssize_t len_{-1}; // -1 = template mode, >=0 = static mode with length
union Data { union Data {
std::vector<uint8_t> (*func)(Ts...); std::vector<uint8_t> (*func)(Ts...); // Function pointer (stateless lambdas)
struct { const uint8_t *data; // Pointer to static data in flash
const uint8_t *ptr;
size_t len;
} static_data;
} data_; } data_;
}; };