update cspot

components/spotify/cspot/include/AudioChunk.h

@@ -4,7 +4,6 @@
 #include <vector>
 #include <string>
 #include <algorithm>
-#include "pthread.h"
 #include "platform/WrappedSemaphore.h"
 #include "Crypto.h"
 #include "Utils.h"
@@ -28,7 +27,6 @@ public:
     std::vector<uint8_t> decryptedData;
     std::vector<uint8_t> audioKey;
     bool keepInMemory = false;
-    pthread_mutex_t loadingMutex;
     std::mutex dataAccessMutex;
     uint32_t startPosition;
     uint32_t endPosition;

components/spotify/cspot/include/AudioChunkManager.h

@@ -8,7 +8,7 @@
 #include "Utils.h"
 #include "AudioChunk.h"
 #include "Queue.h"
-#include "Task.h"
+#include "BellTask.h"
 
 #define DATA_SIZE_HEADER 24
 #define DATA_SIZE_FOOTER 2

components/spotify/cspot/include/ChunkedAudioStream.h

@@ -5,7 +5,9 @@
 #include <vector>
 #include <fstream>
 #include <array>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include <atomic>
 #include "ivorbisfile.h"
 #include "MercuryManager.h"

components/spotify/cspot/include/MercuryManager.h

@@ -14,7 +14,7 @@
 #include "AudioChunk.h"
 #include "AudioChunkManager.h"
 #include <atomic>
-#include "Task.h"
+#include "BellTask.h"
 #include "platform/WrappedSemaphore.h"
 #include "TimeProvider.h"
 #include "Session.h"

components/spotify/cspot/include/PlainConnection.h

@@ -1,13 +1,18 @@
 #ifndef PLAINCONNECTION_H
 #define PLAINCONNECTION_H
-
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include "win32shim.h"
+#else
 #include "sys/socket.h"
+#include <netdb.h>
+#include <unistd.h>
+#endif
 #include <functional>
 #include <vector>
 #include <string>
 #include <cstdint>
-#include <netdb.h>
-#include <unistd.h>
 #include "Packet.h"
 #include "Utils.h"
 

components/spotify/cspot/include/Player.h

@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <string>
+#include <math.h>
 #include <functional>
 #include <atomic>
 #include <mutex>
@@ -14,7 +15,7 @@
 #include "SpotifyTrack.h"
 #include "AudioSink.h"
 #include <mutex>
-#include "Task.h"
+#include "BellTask.h"
 
 class Player : public bell::Task {
 private:

components/spotify/cspot/include/ShannonConnection.h

@@ -2,11 +2,17 @@
 #define SHANNONCONNECTION_H
 
 #include <vector>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include "win32shim.h"
+#else
 #include <unistd.h>
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <string>
 #include <netdb.h>
+#endif
+#include <sys/types.h>
+#include <string>
 #include <memory>
 #include <cstdint>
 #include "platform/WrappedMutex.h"

components/spotify/cspot/include/Utils.h

@@ -1,11 +1,16 @@
 #ifndef UTILS_H
 #define UTILS_H
-
-#include <unistd.h>
 #include <vector>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include "win32shim.h"
+#else
+#include <unistd.h>
 #include "sys/socket.h"
-#include <cstdint>
 #include <netdb.h>
+#endif
+#include <cstdint>
 #include <cstring>
 #include <memory>
 #include <chrono>

components/spotify/cspot/include/ZeroconfAuthenticator.h

@@ -2,19 +2,23 @@
 #define ZEROCONFAUTHENTICATOR_H
 
 #include <vector>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 #include <string>
 #include <BaseHTTPServer.h>
 #include <cstdlib>
 #include "Utils.h"
 #include "LoginBlob.h"
 #include "Crypto.h"
-#include "Task.h"
+#include "BellTask.h"
 #include "ConstantParameters.h"
 
 
 #ifdef ESP_PLATFORM
 #include "mdns.h"
+#elif defined(_WIN32)
+#include "mdnssvc.h"
 #else
 #include "dns_sd.h"
 #include <unistd.h>
@@ -31,6 +35,9 @@ typedef std::function<void(std::shared_ptr<LoginBlob>)> authCallback;
 
 class ZeroconfAuthenticator {
 private:
+#ifdef _WIN32
+	struct mdnsd* service;
+#endif
     int serverPort;
     bool authorized = false;
     std::unique_ptr<Crypto> crypto;