From 4d99d22e10a3cb2a421da1618c127128816613c9 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 26 Sep 2023 13:36:07 +1000 Subject: std::string -> std::pmr::string in psram --- src/audio/include/audio_events.hpp | 2 +- src/audio/include/fatfs_audio_input.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/audio/include') diff --git a/src/audio/include/audio_events.hpp b/src/audio/include/audio_events.hpp index 5af419ab..6b986462 100644 --- a/src/audio/include/audio_events.hpp +++ b/src/audio/include/audio_events.hpp @@ -31,7 +31,7 @@ struct QueueUpdate : tinyfsm::Event { }; struct PlayFile : tinyfsm::Event { - std::string filename; + std::pmr::string filename; }; struct VolumeChanged : tinyfsm::Event {}; diff --git a/src/audio/include/fatfs_audio_input.hpp b/src/audio/include/fatfs_audio_input.hpp index b67d29dc..b7b1d18e 100644 --- a/src/audio/include/fatfs_audio_input.hpp +++ b/src/audio/include/fatfs_audio_input.hpp @@ -37,8 +37,8 @@ class FatfsAudioInput : public IAudioSource { * Immediately cease reading any current source, and begin reading from the * given file path. */ - auto SetPath(std::future>) -> void; - auto SetPath(const std::string&) -> void; + auto SetPath(std::future>) -> void; + auto SetPath(const std::pmr::string&) -> void; auto SetPath() -> void; auto HasNewStream() -> bool override; @@ -48,7 +48,7 @@ class FatfsAudioInput : public IAudioSource { FatfsAudioInput& operator=(const FatfsAudioInput&) = delete; private: - auto OpenFile(const std::string& path) -> bool; + auto OpenFile(const std::pmr::string& path) -> bool; auto ContainerToStreamType(database::Container) -> std::optional; @@ -60,7 +60,7 @@ class FatfsAudioInput : public IAudioSource { SemaphoreHandle_t has_new_stream_; - std::unique_ptr>> + std::unique_ptr>> pending_path_; }; -- cgit v1.2.3