summaryrefslogtreecommitdiff
path: root/src/audio/fatfs_audio_input.cpp
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-09-26 13:36:07 +1000
committerjacqueline <me@jacqueline.id.au>2023-09-26 13:36:07 +1000
commit4d99d22e10a3cb2a421da1618c127128816613c9 (patch)
tree527490a466348e5cf40cf10a8f3768aa5be4e7c1 /src/audio/fatfs_audio_input.cpp
parentf6d06421090f88094aba76b72b04d614f54efafa (diff)
downloadtangara-fw-4d99d22e10a3cb2a421da1618c127128816613c9.tar.gz
std::string -> std::pmr::string in psram
Diffstat (limited to 'src/audio/fatfs_audio_input.cpp')
-rw-r--r--src/audio/fatfs_audio_input.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/audio/fatfs_audio_input.cpp b/src/audio/fatfs_audio_input.cpp
index 6b032632..f71f0463 100644
--- a/src/audio/fatfs_audio_input.cpp
+++ b/src/audio/fatfs_audio_input.cpp
@@ -52,16 +52,17 @@ FatfsAudioInput::~FatfsAudioInput() {
vSemaphoreDelete(has_new_stream_);
}
-auto FatfsAudioInput::SetPath(std::future<std::optional<std::string>> fut)
+auto FatfsAudioInput::SetPath(std::future<std::optional<std::pmr::string>> fut)
-> void {
std::lock_guard<std::mutex> guard{new_stream_mutex_};
pending_path_.reset(
- new database::FutureFetcher<std::optional<std::string>>(std::move(fut)));
+ new database::FutureFetcher<std::optional<std::pmr::string>>(
+ std::move(fut)));
xSemaphoreGive(has_new_stream_);
}
-auto FatfsAudioInput::SetPath(const std::string& path) -> void {
+auto FatfsAudioInput::SetPath(const std::pmr::string& path) -> void {
std::lock_guard<std::mutex> guard{new_stream_mutex_};
if (OpenFile(path)) {
xSemaphoreGive(has_new_stream_);
@@ -114,7 +115,7 @@ auto FatfsAudioInput::NextStream() -> std::shared_ptr<codecs::IStream> {
}
}
-auto FatfsAudioInput::OpenFile(const std::string& path) -> bool {
+auto FatfsAudioInput::OpenFile(const std::pmr::string& path) -> bool {
ESP_LOGI(kTag, "opening file %s", path.c_str());
database::TrackTags tags;