Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-27 17:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

some extra fixes

Browse source
This commit is contained in:
NP v/d Spek 2024-10-28 22:03:33 +01:00
parent a671507be6
commit 4e03bb977e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
esphome/components/audio/audio.cpp
View file

@ -10,7 +10,7 @@ AudioStreamer *AudioListener::start(const AudioStreamInfo &audio_stream_info) {
return nullptr; return nullptr;
} }
if (this->starting(audio_stream_info)) { if (this->starting(audio_stream_info)) {
this->current_streamer_ = new AudioStreamer(); this->current_streamer_ = new AudioStreamer(); // NOLINT(cppcoreguidelines-owning-memory)
this->current_streamer_->set_parent(this); this->current_streamer_->set_parent(this);
} }
return nullptr; return nullptr;

4
esphome/components/speaker/automation.h
View file

@ -20,13 +20,13 @@ template<typename... Ts> class PlayAction : public Action<Ts...>, public Parente
} }
void play(Ts... x) override { void play(Ts... x) override {
auto val = this->data_func_(x...); auto val = data_static_;
if (!this->static_) { if (!this->static_) {
val = this->data_func_(x...); val = this->data_func_(x...);
} }
auto streamer = this->parent_->start(); auto streamer = this->parent_->start();
streamer->stream(val); streamer->stream(val.data(), val.size());
delete streamer; delete streamer;
} }

2
esphome/components/voice_assistant/voice_assistant.cpp
View file

@ -436,7 +436,7 @@ void VoiceAssistant::write_speaker_() {
if ((this->speaker_ != nullptr) && (this->speaker_buffer_ != nullptr)) { if ((this->speaker_ != nullptr) && (this->speaker_buffer_ != nullptr)) {
if (this->speaker_buffer_size_ > 0) { if (this->speaker_buffer_size_ > 0) {
size_t write_chunk = std::min<size_t>(this->speaker_buffer_size_, 4 * 1024); size_t write_chunk = std::min<size_t>(this->speaker_buffer_size_, 4 * 1024);
size_t written = this->speaker_->play(this->speaker_buffer_, write_chunk); size_t written = 0; // this->speaker_->play(this->speaker_buffer_, write_chunk);
if (written > 0) { if (written > 0) {
memmove(this->speaker_buffer_, this->speaker_buffer_ + written, this->speaker_buffer_size_ - written); memmove(this->speaker_buffer_, this->speaker_buffer_ + written, this->speaker_buffer_size_ - written);
this->speaker_buffer_size_ -= written; this->speaker_buffer_size_ -= written;