diff --git a/keywords.txt b/keywords.txt
index 560cdfc..b00d2dd 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -1,6 +1,6 @@
AudioFileSource KEYWORD1
AudioFileSourceSPIFFS KEYWORD1
-AudioFileSourceFastROMFS KEYWORD1
+AudioFileSourceFS KEYWORD1
AudioFileSourcePROGMEM KEYWORD1
AudioFileSourceHTTPStream KEYWORD1
AudioFileSourceICYStream KEYWORD1
diff --git a/src/AudioFileSourceSPIFFS.cpp b/src/AudioFileSourceFS.cpp
similarity index 63%
rename from src/AudioFileSourceSPIFFS.cpp
rename to src/AudioFileSourceFS.cpp
index 0c48fef..2fc8a00 100644
--- a/src/AudioFileSourceSPIFFS.cpp
+++ b/src/AudioFileSourceFS.cpp
@@ -1,6 +1,6 @@
/*
- AudioFileSourceSPIFFS
- Input SPIFFS "file" to be used by AudioGenerator
+ AudioFileSourceFS
+ Input "file" to be used by AudioGenerator
Copyright (C) 2017 Earle F. Philhower, III
@@ -18,54 +18,51 @@
along with this program. If not, see .
*/
-#include "AudioFileSourceSPIFFS.h"
+#include "AudioFileSourceFS.h"
#ifdef ESP32
#include "SPIFFS.h"
#endif
-AudioFileSourceSPIFFS::AudioFileSourceSPIFFS()
-{
-}
-
-AudioFileSourceSPIFFS::AudioFileSourceSPIFFS(const char *filename)
+AudioFileSourceFS::AudioFileSourceFS(FS &fs, const char *filename)
{
+ filesystem = &fs;
open(filename);
}
-bool AudioFileSourceSPIFFS::open(const char *filename)
+bool AudioFileSourceFS::open(const char *filename)
{
- SPIFFS.begin();
- f = SPIFFS.open(filename, "r");
+ filesystem->begin();
+ f = filesystem->open(filename, "r");
return f;
}
-AudioFileSourceSPIFFS::~AudioFileSourceSPIFFS()
+AudioFileSourceFS::~AudioFileSourceFS()
{
if (f) f.close();
}
-uint32_t AudioFileSourceSPIFFS::read(void *data, uint32_t len)
+uint32_t AudioFileSourceFS::read(void *data, uint32_t len)
{
return f.read(reinterpret_cast(data), len);
}
-bool AudioFileSourceSPIFFS::seek(int32_t pos, int dir)
+bool AudioFileSourceFS::seek(int32_t pos, int dir)
{
return f.seek(pos, (dir==SEEK_SET)?SeekSet:(dir==SEEK_CUR)?SeekCur:SeekEnd);
}
-bool AudioFileSourceSPIFFS::close()
+bool AudioFileSourceFS::close()
{
f.close();
return true;
}
-bool AudioFileSourceSPIFFS::isOpen()
+bool AudioFileSourceFS::isOpen()
{
return f?true:false;
}
-uint32_t AudioFileSourceSPIFFS::getSize()
+uint32_t AudioFileSourceFS::getSize()
{
if (!f) return 0;
return f.size();
diff --git a/src/AudioFileSourceSPIFFS.h b/src/AudioFileSourceFS.h
similarity index 76%
rename from src/AudioFileSourceSPIFFS.h
rename to src/AudioFileSourceFS.h
index a3c66f6..fea34c2 100644
--- a/src/AudioFileSourceSPIFFS.h
+++ b/src/AudioFileSourceFS.h
@@ -1,6 +1,6 @@
/*
- AudioFileSourceSPIFFS
- Input SPIFFS "file" to be used by AudioGenerator
+ AudioFileSourceFS
+ Input Arduion "file" to be used by AudioGenerator
Copyright (C) 2017 Earle F. Philhower, III
@@ -18,20 +18,20 @@
along with this program. If not, see .
*/
-#ifndef _AUDIOFILESOURCESPIFFS_H
-#define _AUDIOFILESOURCESPIFFS_H
+#ifndef _AUDIOFILESOURCEFS_H
+#define _AUDIOFILESOURCEFS_H
#include
#include
#include "AudioFileSource.h"
-class AudioFileSourceSPIFFS : public AudioFileSource
+class AudioFileSourceFS : public AudioFileSource
{
public:
- AudioFileSourceSPIFFS();
- AudioFileSourceSPIFFS(const char *filename);
- virtual ~AudioFileSourceSPIFFS() override;
+ AudioFileSourceFS(FS &fs) { filesystem = &fs; }
+ AudioFileSourceFS(FS &fs, const char *filename);
+ virtual ~AudioFileSourceFS() override;
virtual bool open(const char *filename) override;
virtual uint32_t read(void *data, uint32_t len) override;
@@ -42,7 +42,8 @@ class AudioFileSourceSPIFFS : public AudioFileSource
virtual uint32_t getPos() override { if (!f) return 0; else return f.position(); };
private:
- fs::File f;
+ FS *filesystem;
+ File f;
};