move to new cspot

components/spotify/cspot/include/PlainConnection.h

@@ -5,32 +5,45 @@
 #include <ws2tcpip.h>
 #include "win32shim.h"
 #else
-#include "sys/socket.h"
 #include <netdb.h>
 #include <unistd.h>
+#include "sys/socket.h"
+#include <netinet/in.h>
 #endif
-#include <functional>
-#include <vector>
-#include <string>
 #include <cstdint>
+#include <functional>
+#include <string>
+#include <vector>
 #include "Packet.h"
 #include "Utils.h"
 
 typedef std::function<bool()> timeoutCallback;
 
-class PlainConnection
-{
-public:
-    PlainConnection();
-    ~PlainConnection();
+namespace cspot {
+class PlainConnection {
+ public:
+  PlainConnection();
+  ~PlainConnection();
+
+  /**
+   * @brief Connect to the given AP address
+   * 
+   * @param apAddress The AP url to connect to
+   */
+  void connect(const std::string& apAddress);
+  void close();
+
+  timeoutCallback timeoutHandler;
+  std::vector<uint8_t> sendPrefixPacket(const std::vector<uint8_t>& prefix,
+                                        const std::vector<uint8_t>& data);
+  std::vector<uint8_t> recvPacket();
+
+  void readBlock(const uint8_t* dst, size_t size);
+  size_t writeBlock(const std::vector<uint8_t>& data);
+
+  private:
     int apSock;
-    void connectToAp(std::string apAddress);
-    void closeSocket();
-    timeoutCallback timeoutHandler;
-    std::vector<uint8_t> sendPrefixPacket(const std::vector<uint8_t> &prefix, const std::vector<uint8_t> &data);
-    std::vector<uint8_t> recvPacket();
-    std::vector<uint8_t> readBlock(size_t size);
-    size_t writeBlock(const std::vector<uint8_t> &data);
 };
+}  // namespace cspot
 
 #endif