Moved reading of SD card data into a dedicated class DataSource.

include/data_sources.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include <Arduino.h>
+#include <SD.h>
+#include "config.h"
+
+class DataSource {
+private:
+public:
+	DataSource() {};
+	~DataSource() {};
+	virtual size_t read(uint8_t* buf, size_t len) = 0;
+	virtual uint8_t read() = 0;
+	virtual size_t position() = 0;
+	virtual void seek(size_t position) = 0;
+	virtual size_t size() = 0;
+	virtual void close() = 0;
+	virtual void skip_id3_tag();
+};
+
+class SDDataSource : public DataSource {
+private:
+	File _file;
+public:
+	SDDataSource(String file);
+	~SDDataSource();
+	size_t read(uint8_t* buf, size_t len);
+	uint8_t read();
+	size_t position();
+	void seek(size_t position);
+	size_t size();
+	void close();
+	void skip_id3_tag();
+};

include/player.h

@@ -4,6 +4,7 @@
 #include <SD.h>
 #include "spi_master.h"
 #include "playlist.h"
+#include "data_sources.h"
 
 class Player;
 
@@ -55,7 +56,6 @@ private:
 	void _flush_and_cancel();
 	int8_t _get_endbyte();
 	void _flush(uint count, int8_t fill_byte);
-	uint32_t _id3_tag_offset(File f);
 	void _play_file(String filename, uint32_t offset);
 	void _finish_playing();
 	void _finish_stopping(bool turn_speaker_off);
@@ -72,7 +72,7 @@ private:
 	SPISettings _spi_settings_fast = SPISettings(4000000, MSBFIRST, SPI_MODE0);
 	SPISettings* _spi_settings = &_spi_settings_slow;
 
-	File _file;
+	DataSource* _file;
 	uint32_t _file_size = 0;
 	uint8_t _buffer[32];
 	uint32_t _current_play_position = 0;