update album/title info

Author: thijstriemstra

YX5300_AudioPlayer/YX5300_AudioPlayer.cpp

@@ -131,11 +131,21 @@ void YX5300_AudioPlayer::loop() {
  * @param tracks
 */
 void YX5300_AudioPlayer::setTrackList(std::vector<String> folders, std::vector<String> tracks) {
+  _originalFolders = folders;
+  _originalTracks = tracks;
+
+  setPlayList();
+}
+
+/**
+ * Set play list title and album data.
+*/
+void YX5300_AudioPlayer::setPlayList() {
   // save track information
   for (size_t x = 0; x < _playList.size(); ++x) {
     Track item = _playList.at(x);
-    _playList.at(x).title = tracks.at(item.index - 1);
-    _playList.at(x).album = folders.at(item.folder - 1);
+    _playList.at(x).title = _originalTracks.at(item.index - 1);
+    _playList.at(x).album = _originalFolders.at(item.folder - 1);
     /*
     Log.info(F("Track %d in folder %d: %s (%s)" CR),
       item.index,
@@ -402,6 +412,11 @@ void YX5300_AudioPlayer::createRandomPlayList(uint8_t folder) {
 Track YX5300_AudioPlayer::getRandomTrack(uint8_t folder) {
   createRandomPlayList(folder);
 
+  if (_playListCompleted.size() == 0) {
+    // update title/album info
+    setPlayList();
+  }
+
   // pick first randomized track, remove it from the playlist,
   // and add it to the completed playlist.
   Track tr = _playList.at(0);

YX5300_AudioPlayer/YX5300_AudioPlayer.h

@@ -62,6 +62,7 @@ class YX5300_AudioPlayer {
     void setTimeout(uint32_t timeout = 200);
     void setVolume(uint8_t volume);
     void setEqualizerMode(uint8_t mode);
+    void setPlayList();
     void setTrackList(std::vector<String> folders, std::vector<String> tracks);
     uint8_t getMaxVolume();
     void queryFile();
@@ -87,6 +88,8 @@ class YX5300_AudioPlayer {
     bool _shuffleEnabled = false;
     bool _shuffleAll = true;
 
+    std::vector<String> _originalFolders;
+    std::vector<String> _originalTracks;
     std::vector<int> _folders;
     std::vector<Track> _playList;
     std::vector<Track> _playListCompleted;