From a65d996583c72e0d77805bcbc36da580aacb2848 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 14 Feb 2023 14:30:53 +1100 Subject: Use the sync apis for I2S output --- src/audio/fatfs_audio_input.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/audio/fatfs_audio_input.cpp') diff --git a/src/audio/fatfs_audio_input.cpp b/src/audio/fatfs_audio_input.cpp index 8990bf4f..fd1c1f3a 100644 --- a/src/audio/fatfs_audio_input.cpp +++ b/src/audio/fatfs_audio_input.cpp @@ -71,11 +71,10 @@ auto FatfsAudioInput::ProcessChunk(const cpp::span& chunk) auto FatfsAudioInput::ProcessEndOfStream() -> void { if (is_file_open_) { - f_close(¤t_file_); - is_file_open_ = false; - SendOrBufferEvent( - std::unique_ptr( - StreamEvent::CreateEndOfStream(input_events_))); + f_close(¤t_file_); + is_file_open_ = false; + SendOrBufferEvent(std::unique_ptr( + StreamEvent::CreateEndOfStream(input_events_))); } } @@ -85,7 +84,6 @@ auto FatfsAudioInput::Process() -> cpp::result { StreamEvent::CreateChunkData(input_events_, kChunkSize)); UINT bytes_read = 0; - ESP_LOGI(kTag, "reading from file"); FRESULT result = f_read(¤t_file_, dest_event->chunk_data.raw_bytes, kChunkSize, &bytes_read); if (result != FR_OK) { @@ -93,13 +91,11 @@ auto FatfsAudioInput::Process() -> cpp::result { return cpp::fail(IO_ERROR); } - ESP_LOGI(kTag, "sending file data (%u bytes)", bytes_read); dest_event->chunk_data.bytes = dest_event->chunk_data.bytes.first(bytes_read); SendOrBufferEvent(std::move(dest_event)); if (bytes_read < kChunkSize || f_eof(¤t_file_)) { - ESP_LOGI(kTag, "closing file"); f_close(¤t_file_); is_file_open_ = false; } -- cgit v1.2.3