diff --git a/esphome/components/nabu/audio_pipeline.cpp b/esphome/components/nabu/audio_pipeline.cpp index f405808d1b..d19dcaf896 100644 --- a/esphome/components/nabu/audio_pipeline.cpp +++ b/esphome/components/nabu/audio_pipeline.cpp @@ -137,17 +137,17 @@ esp_err_t AudioPipeline::common_start_(uint32_t target_sample_rate, const std::s if (this->read_task_handle_ == nullptr) { this->read_task_handle_ = - xTaskCreateStatic(AudioPipeline::read_task_, (task_name + "_read").c_str(), READER_TASK_STACK_SIZE, + xTaskCreateStatic(AudioPipeline::read_task, (task_name + "_read").c_str(), READER_TASK_STACK_SIZE, (void *) this, priority, this->read_task_stack_buffer_, &this->read_task_stack_); } if (this->decode_task_handle_ == nullptr) { this->decode_task_handle_ = - xTaskCreateStatic(AudioPipeline::decode_task_, (task_name + "_decode").c_str(), DECODER_TASK_STACK_SIZE, + xTaskCreateStatic(AudioPipeline::decode_task, (task_name + "_decode").c_str(), DECODER_TASK_STACK_SIZE, (void *) this, priority, this->decode_task_stack_buffer_, &this->decode_task_stack_); } if (this->resample_task_handle_ == nullptr) { this->resample_task_handle_ = - xTaskCreateStatic(AudioPipeline::resample_task_, (task_name + "_resample").c_str(), RESAMPLER_TASK_STACK_SIZE, + xTaskCreateStatic(AudioPipeline::resample_task, (task_name + "_resample").c_str(), RESAMPLER_TASK_STACK_SIZE, (void *) this, priority, this->resample_task_stack_buffer_, &this->resample_task_stack_); } @@ -314,7 +314,7 @@ void AudioPipeline::resume_tasks() { } } -void AudioPipeline::read_task_(void *params) { +void AudioPipeline::read_task(void *params) { AudioPipeline *this_pipeline = (AudioPipeline *) params; while (true) { @@ -380,7 +380,7 @@ void AudioPipeline::read_task_(void *params) { } } -void AudioPipeline::decode_task_(void *params) { +void AudioPipeline::decode_task(void *params) { AudioPipeline *this_pipeline = (AudioPipeline *) params; while (true) { @@ -467,7 +467,7 @@ void AudioPipeline::decode_task_(void *params) { } } -void AudioPipeline::resample_task_(void *params) { +void AudioPipeline::resample_task(void *params) { AudioPipeline *this_pipeline = (AudioPipeline *) params; while (true) { diff --git a/esphome/components/nabu/audio_pipeline.h b/esphome/components/nabu/audio_pipeline.h index 03d88b76fc..d5c7257996 100644 --- a/esphome/components/nabu/audio_pipeline.h +++ b/esphome/components/nabu/audio_pipeline.h @@ -129,19 +129,19 @@ class AudioPipeline { QueueHandle_t info_error_queue_{nullptr}; // Handles reading the media file from flash or a url - static void read_task_(void *params); + static void read_task(void *params); TaskHandle_t read_task_handle_{nullptr}; StaticTask_t read_task_stack_; StackType_t *read_task_stack_buffer_{nullptr}; // Decodes the media file into PCM audio - static void decode_task_(void *params); + static void decode_task(void *params); TaskHandle_t decode_task_handle_{nullptr}; StaticTask_t decode_task_stack_; StackType_t *decode_task_stack_buffer_{nullptr}; // Resamples the audio to match the specified target sample rate. Converts mono audio to stereo audio if necessary. - static void resample_task_(void *params); + static void resample_task(void *params); TaskHandle_t resample_task_handle_{nullptr}; StaticTask_t resample_task_stack_; StackType_t *resample_task_stack_buffer_{nullptr};