From 7d7f7755d17e1e0a2348d75d797097f166b70471 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 2 May 2024 21:41:56 +1000 Subject: start moving include files into subdirs --- src/tangara/audio/fatfs_audio_input.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/tangara/audio/fatfs_audio_input.cpp') diff --git a/src/tangara/audio/fatfs_audio_input.cpp b/src/tangara/audio/fatfs_audio_input.cpp index e5fb3b21..0868d71a 100644 --- a/src/tangara/audio/fatfs_audio_input.cpp +++ b/src/tangara/audio/fatfs_audio_input.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "fatfs_audio_input.hpp" +#include "audio/fatfs_audio_input.hpp" #include #include @@ -18,24 +18,24 @@ #include #include +#include "audio/readahead_source.hpp" #include "esp_heap_caps.h" #include "esp_log.h" #include "ff.h" #include "freertos/portmacro.h" #include "freertos/projdefs.h" -#include "readahead_source.hpp" -#include "audio_events.hpp" -#include "audio_fsm.hpp" -#include "audio_source.hpp" +#include "audio/audio_events.hpp" +#include "audio/audio_fsm.hpp" +#include "audio/audio_source.hpp" +#include "audio/fatfs_source.hpp" #include "codec.hpp" -#include "event_queue.hpp" -#include "fatfs_source.hpp" -#include "future_fetcher.hpp" +#include "database/future_fetcher.hpp" +#include "database/tag_parser.hpp" +#include "database/track.hpp" +#include "events/event_queue.hpp" #include "spi.hpp" -#include "tag_parser.hpp" #include "tasks.hpp" -#include "track.hpp" #include "types.hpp" [[maybe_unused]] static const char* kTag = "SRC"; @@ -61,8 +61,8 @@ auto FatfsAudioInput::SetPath(std::optional path) -> void { } } -auto FatfsAudioInput::SetPath(const std::string& path, uint32_t offset) - -> void { +auto FatfsAudioInput::SetPath(const std::string& path, + uint32_t offset) -> void { std::lock_guard guard{new_stream_mutex_}; if (OpenFile(path, offset)) { has_new_stream_ = true; @@ -103,8 +103,8 @@ auto FatfsAudioInput::NextStream() -> std::shared_ptr { } } -auto FatfsAudioInput::OpenFile(const std::string& path, uint32_t offset) - -> bool { +auto FatfsAudioInput::OpenFile(const std::string& path, + uint32_t offset) -> bool { ESP_LOGI(kTag, "opening file %s", path.c_str()); auto tags = tag_parser_.ReadAndParseTags(path); -- cgit v1.2.3