github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-11 23:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[speaker.media_player] Avoid heap allocation for triggers (#13707)

Browse Source
This commit is contained in:
J. Nick Koston
2026-02-02 05:15:33 +01:00
committed by GitHub
parent dbd7401721
commit 1362ff6cba
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/mixer/speaker/automation.h
+1
View File
@@ -1,5 +1,6 @@
#pragma once
#include "esphome/core/automation.h"
#include "mixer_speaker.h"
#ifdef USE_ESP32
esphome/components/speaker/media_player/speaker_media_player.cpp
+3 -3
View File
@@ -519,9 +519,9 @@ void SpeakerMediaPlayer::set_mute_state_(bool mute_state) {
if (old_mute_state != mute_state) {
if (mute_state) {
this->defer([this]() { this->mute_trigger_->trigger(); });
this->defer([this]() { this->mute_trigger_.trigger(); });
} else {
this->defer([this]() { this->unmute_trigger_->trigger(); });
this->defer([this]() { this->unmute_trigger_.trigger(); });
}
}
}
@@ -550,7 +550,7 @@ void SpeakerMediaPlayer::set_volume_(float volume, bool publish) {
this->set_mute_state_(false);
}
this->defer([this, volume]() { this->volume_trigger_->trigger(volume); });
this->defer([this, volume]() { this->volume_trigger_.trigger(volume); });
}
} // namespace speaker
esphome/components/speaker/media_player/speaker_media_player.h
+6 -6
View File
@@ -84,9 +84,9 @@ class SpeakerMediaPlayer : public Component,
this->media_format_ = media_format;
}
Trigger<> *get_mute_trigger() const { return this->mute_trigger_; }
Trigger<> *get_unmute_trigger() const { return this->unmute_trigger_; }
Trigger<float> *get_volume_trigger() const { return this->volume_trigger_; }
Trigger<> *get_mute_trigger() { return &this->mute_trigger_; }
Trigger<> *get_unmute_trigger() { return &this->unmute_trigger_; }
Trigger<float> *get_volume_trigger() { return &this->volume_trigger_; }
void play_file(audio::AudioFile *media_file, bool announcement, bool enqueue);
@@ -154,9 +154,9 @@ class SpeakerMediaPlayer : public Component,
// Used to save volume/mute state for restoration on reboot
ESPPreferenceObject pref_;
Trigger<> *mute_trigger_ = new Trigger<>();
Trigger<> *unmute_trigger_ = new Trigger<>();
Trigger<float> *volume_trigger_ = new Trigger<float>();
Trigger<> mute_trigger_;
Trigger<> unmute_trigger_;
Trigger<float> volume_trigger_;
};
} // namespace speaker