catching up (trying to) wiht CSpot

components/spotify/cspot/include/AudioChunk.h

@@ -62,7 +62,7 @@ public:
      * 
      * @param data encrypted binary audio data.
      */
-    void appendData(std::vector<uint8_t> &data);
+    void appendData(const std::vector<uint8_t> &data);
 
     /**
      * @brief Performs AES CTR decryption of received data.

components/spotify/cspot/include/AudioChunkManager.h

@@ -21,6 +21,7 @@ public:
     AudioChunkManager();
     std::atomic<bool> isRunning = false;
     std::mutex runningMutex;
+    std::mutex chunkMutex;
     /**
      * @brief Registers a new audio chunk request.
      * 
@@ -54,4 +55,4 @@ public:
     void close();
 };
 
-#endif
+#endif

components/spotify/cspot/include/AudioSink.h

@@ -1,18 +0,0 @@
-#ifndef AUDIOSINK_H
-#define AUDIOSINK_H
-
-#include <stdint.h>
-#include <vector>
-
-class AudioSink
-{
-public:
-    AudioSink() {}
-    virtual ~AudioSink() {}
-    virtual void feedPCMFrames(std::vector<uint8_t> &data) = 0;
-    virtual void volumeChanged(uint16_t volume) {}
-    bool softwareVolumeControl = true;
-    bool usign = false;
-};
-
-#endif

components/spotify/cspot/include/ChunkedAudioStream.h

@@ -12,6 +12,7 @@
 #include "AudioSink.h"
 #include "AudioChunk.h"
 #include "platform/WrappedMutex.h"
+#include "ChunkedByteStream.h"
 
 #define SPOTIFY_HEADER_SIZE 167
 #define BUFFER_SIZE 0x20000 * 1.5
@@ -32,10 +33,6 @@ private:
     ov_callbacks vorbisCallbacks;
     int currentSection;
 
-    // Audio chunking
-    std::vector<uint8_t> audioKey;
-    std::vector<std::shared_ptr<AudioChunk>> chunks;
-
     // Audio data
     uint32_t duration;
 
@@ -46,19 +43,12 @@ private:
     std::vector<uint8_t> fileId;
     uint32_t startPositionMs;
 
-    std::shared_ptr<AudioChunk> requestChunk(size_t chunkIndex);
-    void fetchTraillingPacket();
-    std::shared_ptr<AudioChunk> findChunkForPosition(size_t position);
-
 public:
     ChunkedAudioStream(std::vector<uint8_t> fileId, std::vector<uint8_t> audioKey, uint32_t duration, std::shared_ptr<MercuryManager> manager, uint32_t startPositionMs, bool isPaused);
     ~ChunkedAudioStream();
-    int requestedChunkIndex = 0;
+    std::shared_ptr<ChunkedByteStream> byteStream;
+
     std::function<void()> streamFinishedCallback;
-    size_t pos = SPOTIFY_HEADER_SIZE; // size of some spotify header
-    uint32_t fileSize;
-    uint32_t readBeforeSeek = 0;
-    bool loadingMeta = true;
     std::atomic<bool> isPaused = false;
     std::atomic<bool> isRunning = false;
     std::atomic<bool> finished = false;