Merge pull request #44 from podaen/main

FatType Definition And IcyStream Exclude

Author: pschatzmann

src/AudioHttp/ICYStream.h

@@ -1,4 +1,5 @@
 #pragma once
+#ifdef USE_URL_ARDUINO
 
 #include "AudioConfig.h"
 #include "AudioHttp/URLStreamESP32.h"
@@ -15,6 +16,8 @@ namespace audio_tools {
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
+
+
 class ICYStreamDefault : public AbstractURLStream {
 
     public:
@@ -170,4 +173,5 @@ class ICYStream : public ICYStreamDefault {
 
 #endif
 
-} // namespace
+} // namespace
+#endif

src/AudioTools/AudioPlayer.h

@@ -16,7 +16,9 @@
 #include <SdFat.h>
 #endif
 
-
+// SD_FAT_TYPE = 0 for SdFat/File as defined in SdFatConfig.h,
+// 1 for FAT16/FAT32, 2 for exFAT, 3 for FAT16/FAT32 and exFAT.
+#define SD_FAT_TYPE 1
 // Try max SPI clock for an SD. Reduce SPI_CLOCK if errors occur. (40?)
 #define SPI_CLOCK SD_SCK_MHZ(50)
 // Max file name length including directory path
@@ -139,8 +141,24 @@ namespace audio_tools {
     typedef sdfat::FsFile AudioFile;
     typedef sdfat::SdFs AudioFs;
 #else
-    typedef FsFile AudioFile;
-    typedef SdFs AudioFs;
+#if SD_FAT_TYPE == 0
+	typedef SdFat AudioFs;
+	typedef File AudioDir;
+	typedef File AudioFile;
+#elif SD_FAT_TYPE == 1
+	typedef SdFat32 AudioFs;
+	typedef File32 AudioDir;
+	typedef File32 AudioFile;
+#elif SD_FAT_TYPE == 2
+	typedef SdExFat AudioFs;
+	typedef ExFile AudioDir;
+	typedef ExFile AudioFile;
+#elif SD_FAT_TYPE == 3
+	typedef SdFs AudioFs;
+	typedef FsFile AudioDir;
+	typedef FsFile AudioFile;
+#else  // SD_FAT_TYPE
+#endif
 #endif