alignment to 4.0 + misc cspot fixes

components/spotify/cspot/bell/include/HTTPStream.h

@@ -34,6 +34,7 @@ namespace bell
 
 
         bool hasFixedSize = false;
+        std::vector<uint8_t> remainingData;
         size_t contentLength = -1;
         size_t currentPos = -1;
 

components/spotify/cspot/bell/src/HTTPStream.cpp

@@ -175,7 +175,7 @@ size_t bell::HTTPStream::read(uint8_t *buf, size_t nbytes)
 
     if (nread < nbytes)
     {
-        return read(buf + nread, nbytes - nread);
+        return nread + read(buf + nread, nbytes - nread);
     }
     return nread;
 }

components/spotify/cspot/include/SpircController.h

@@ -99,6 +99,11 @@ public:
     void nextSong();
     void setEventHandler(cspotEventHandler handler);
     void stopPlayer();
+
+    /** 
+     * @brief Disconnect players and notify
+     */
+    void disconnect();
 };
 
 #endif

components/spotify/cspot/src/ApResolve.cpp

@@ -76,6 +76,8 @@ std::string ApResolve::getApList()
         jsonData += cur;
     }
 
+	close(sockFd);
+
     return jsonData;
 }
 

components/spotify/cspot/src/MercuryManager.cpp

@@ -192,7 +192,6 @@ void MercuryManager::stop() {
     isRunning = false;
     audioChunkManager->close();
     std::scoped_lock(audioChunkManager->runningMutex, this->runningMutex);
-    this->session->close();
     CSPOT_LOG(debug, "mercury stopped");
 }
 

components/spotify/cspot/src/PlainConnection.cpp

@@ -164,7 +164,8 @@ size_t PlainConnection::writeBlock(const std::vector<uint8_t> &data)
 
 void PlainConnection::closeSocket()
 {
-    CSPOT_LOG(info, "Closing socket...");
-    shutdown(this->apSock, SHUT_RDWR);
-    close(this->apSock);
+	CSPOT_LOG(info, "Closing socket...");
+	shutdown(this->apSock, SHUT_RDWR);
+	close(this->apSock);
+	this->apSock = -1;
 }

components/spotify/cspot/src/SpircController.cpp

@@ -43,13 +43,20 @@ void SpircController::setPause(bool isPaused, bool notifyPlayer) {
         CSPOT_LOG(debug, "External pause command");
         if (notifyPlayer) player->pause();
         state->setPlaybackState(PlaybackState::Paused);
-        notify();
     } else {
         CSPOT_LOG(debug, "External play command");
         if (notifyPlayer) player->play();
         state->setPlaybackState(PlaybackState::Playing);
-        notify();
     }
+    notify();
+}
+
+void SpircController::disconnect(void) {
+    player->cancelCurrentTrack();
+	stopPlayer();
+    state->setActive(false);
+    notify();
+	sendEvent(CSpotEventType::DISC);
 }
 
 void SpircController::playToggle() {
@@ -104,10 +111,7 @@ void SpircController::handleFrame(std::vector<uint8_t> &data) {
         // Pause the playback if another player took control
         if (state->isActive() &&
             state->remoteFrame.device_state->is_active.value()) {
-			sendEvent(CSpotEventType::DISC);
-            state->setActive(false);
-            notify();
-            player->cancelCurrentTrack();
+			disconnect();
         }
         break;
     }