From 8ed3d7e31f8b16a24593c01a480b19b14a513b48 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Sat, 21 Jan 2023 19:01:54 +1100 Subject: Re-enable the parts of the audio pipeline that are working --- src/audio/fatfs_audio_input.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (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 3e501154..f0d4d751 100644 --- a/src/audio/fatfs_audio_input.cpp +++ b/src/audio/fatfs_audio_input.cpp @@ -106,6 +106,8 @@ auto FatfsAudioInput::ProcessIdle() -> cpp::result { read_size = file_buffer_.begin() - file_buffer_write_pos_; } + ESP_LOGI(kTag, "reading up to %d bytes", (int) read_size); + UINT bytes_read = 0; FRESULT result = f_read(¤t_file_, std::addressof(file_buffer_write_pos_), @@ -115,6 +117,8 @@ auto FatfsAudioInput::ProcessIdle() -> cpp::result { return cpp::fail(IO_ERROR); } + ESP_LOGI(kTag, "actual read size %d bytes", (int) bytes_read); + if (f_eof(¤t_file_)) { f_close(¤t_file_); is_file_open_ = false; @@ -130,7 +134,8 @@ auto FatfsAudioInput::ProcessIdle() -> cpp::result { } // Now stream data into the output buffer until it's full. - while (1) { + while (GetRingBufferDistance() > 0) { + ESP_LOGI(kTag, "writing up to %d bytes", (int) GetRingBufferDistance()); ChunkWriteResult result = chunk_writer_->WriteChunkToStream( [&](cpp::span d) { return SendChunk(d); }, kServiceInterval); @@ -146,6 +151,8 @@ auto FatfsAudioInput::ProcessIdle() -> cpp::result { return cpp::fail(IO_ERROR); } } + + return {}; } auto FatfsAudioInput::SendChunk(cpp::span dest) -> size_t { -- cgit v1.2.3