summaryrefslogtreecommitdiff
path: root/src/audio/include/fatfs_audio_input.hpp
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-06-07 15:39:28 +1000
committerjacqueline <me@jacqueline.id.au>2023-06-07 15:39:28 +1000
commite12ac1d9632856237388614bf393c7338500e00a (patch)
tree9f353c516427225906eafa9704f312dd12174a46 /src/audio/include/fatfs_audio_input.hpp
parent7e96482087632278c3d9e4a5db6bad25374ada8f (diff)
downloadtangara-fw-e12ac1d9632856237388614bf393c7338500e00a.tar.gz
Do some prep cleanup for multiple filetypes
Diffstat (limited to 'src/audio/include/fatfs_audio_input.hpp')
-rw-r--r--src/audio/include/fatfs_audio_input.hpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/audio/include/fatfs_audio_input.hpp b/src/audio/include/fatfs_audio_input.hpp
index bfc0064e..1f9f36a1 100644
--- a/src/audio/include/fatfs_audio_input.hpp
+++ b/src/audio/include/fatfs_audio_input.hpp
@@ -18,11 +18,13 @@
#include "ff.h"
#include "freertos/message_buffer.h"
#include "freertos/queue.h"
+#include "song.hpp"
#include "span.hpp"
#include "audio_element.hpp"
#include "stream_buffer.hpp"
#include "stream_info.hpp"
+#include "types.hpp"
namespace audio {
@@ -42,8 +44,14 @@ class FatfsAudioInput : public IAudioElement {
FatfsAudioInput& operator=(const FatfsAudioInput&) = delete;
private:
+ auto ContainerToStreamType(database::Encoding)
+ -> std::optional<codecs::StreamType>;
+
FIL current_file_;
bool is_file_open_;
+
+ std::optional<database::Encoding> current_container_;
+ std::optional<StreamInfo::Format> current_format_;
};
} // namespace audio