summaryrefslogtreecommitdiff
path: root/src/audio/fatfs_audio_input.cpp
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-02-14 14:30:53 +1100
committerjacqueline <me@jacqueline.id.au>2023-02-14 14:30:53 +1100
commita65d996583c72e0d77805bcbc36da580aacb2848 (patch)
treeee64bb43ff2f44f495942e50e77176476b71f7b5 /src/audio/fatfs_audio_input.cpp
parentfa1f1cd9aba914882b95e93cdf64ad01309aa633 (diff)
downloadtangara-fw-a65d996583c72e0d77805bcbc36da580aacb2848.tar.gz
Use the sync apis for I2S output
Diffstat (limited to 'src/audio/fatfs_audio_input.cpp')
-rw-r--r--src/audio/fatfs_audio_input.cpp12
1 files changed, 4 insertions, 8 deletions
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<std::byte>& chunk)
auto FatfsAudioInput::ProcessEndOfStream() -> void {
if (is_file_open_) {
- f_close(&current_file_);
- is_file_open_ = false;
- SendOrBufferEvent(
- std::unique_ptr<StreamEvent>(
- StreamEvent::CreateEndOfStream(input_events_)));
+ f_close(&current_file_);
+ is_file_open_ = false;
+ SendOrBufferEvent(std::unique_ptr<StreamEvent>(
+ StreamEvent::CreateEndOfStream(input_events_)));
}
}
@@ -85,7 +84,6 @@ auto FatfsAudioInput::Process() -> cpp::result<void, AudioProcessingError> {
StreamEvent::CreateChunkData(input_events_, kChunkSize));
UINT bytes_read = 0;
- ESP_LOGI(kTag, "reading from file");
FRESULT result = f_read(&current_file_, dest_event->chunk_data.raw_bytes,
kChunkSize, &bytes_read);
if (result != FR_OK) {
@@ -93,13 +91,11 @@ auto FatfsAudioInput::Process() -> cpp::result<void, AudioProcessingError> {
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(&current_file_)) {
- ESP_LOGI(kTag, "closing file");
f_close(&current_file_);
is_file_open_ = false;
}