Support New TinyFTP version

Author: pschatzmann

examples/examples-communication/ftp/ftp-client/ftp-client.ino

@@ -11,14 +11,12 @@
  */
 
 #include "WiFi.h"
-#include "ArduinoFTPClient.h" // install https://github.com/pschatzmann/TinyFTPClient
+#include "FTPClient.h" // install https://github.com/pschatzmann/TinyFTPClient
 #include "AudioTools.h" // https://github.com/pschatzmann/arduino-audio-tools
 #include "AudioTools/AudioCodecs/CodecMP3Helix.h" // https://github.com/pschatzmann/arduino-libhelix
 #include "AudioTools/AudioLibs/AudioBoardStream.h" // https://github.com/pschatzmann/arduino-audio-driver
 
-WiFiClient cmd;
-WiFiClient data;
-FTPClient client(cmd, data);
+FTPClient<WiFiClient> client;
 FTPFile file;
 AudioBoardStream kit(AudioKitEs8388V1); // or replace with e.g. I2SStream
 MP3DecoderHelix mp3;

examples/examples-player/player-ftp-audiokit/player-ftp-audiokit.ino

@@ -11,16 +11,15 @@
 #include "AudioTools/AudioLibs/AudioBoardStream.h"
 #include "AudioTools/Disk/AudioSourceFTP.h"
 
-const char* path = "Music/Tracy Chapman";
+const char* path = "Music/Tracy Chapman/Matters of the Heart";
 const char* ext = "mp3";
 const char* ftp_user = "user";
 const char* ftp_pwd = "password";
 const char* ssid = "ssid";
 const char* ssid_pwd = "ssid-password";
-WiFiClient cmd;
-WiFiClient data;
-FTPClient ftp(cmd, data);
-AudioSourceFTP source(ftp, path, ext);
+
+FTPClient<WiFiClient> ftp;
+AudioSourceFTP<WiFiClient> source(ftp, path, ext);
 AudioBoardStream i2s(AudioKitEs8388V1);
 MP3DecoderHelix decoder; 
 AudioPlayer player(source, i2s, decoder);

src/AudioTools/Disk/AudioSourceFTP.h

@@ -1,4 +1,4 @@
-#include "ArduinoFTPClient.h"
+#include "FTPClient.h"
 #include "AudioSource.h"
 #include "vector"
 
@@ -17,10 +17,11 @@ namespace audio_tools {
  * @copyright GPLv3
  */
 
-
+template <class ClientType>
 class AudioSourceFTP : public AudioSource {
  public:
-  AudioSourceFTP(FTPClient& client, const char* path, const char* ext,
+  /// Default constructor: Provide the client class as template argument e.g. AudioSourceFTP<WiFiClient> source(client, path, ext);.
+  AudioSourceFTP(FTPClient<ClientType>& client, const char* path, const char* ext,
                  int files = 0) {
     p_client = &client;
     timeout_auto_next_value = 5000;
@@ -98,7 +99,7 @@ class AudioSourceFTP : public AudioSource {
 
  protected:
   std::vector<FTPFile> files;
-  FTPClient* p_client = nullptr;
+  FTPClient<ClientType>* p_client = nullptr;
   FTPFile file;
   int idx = 0;
   size_t max_files = 0;