turned DMD server into re-usable libraray functionality

Author: mkalkbrenner

CMakeLists.txt

@@ -76,6 +76,7 @@ set(DMDUTIL_SOURCES
    src/Logger.cpp
    src/AlphaNumeric.cpp
    src/SceneGenerator.cpp
+   src/DMDServer.cpp
 )
 
 if(PLATFORM STREQUAL "win" OR PLATFORM STREQUAL "macos" OR PLATFORM STREQUAL "linux")
@@ -144,7 +145,7 @@ if(BUILD_SHARED)
 
    if(PLATFORM STREQUAL "win" OR PLATFORM STREQUAL "macos" OR PLATFORM STREQUAL "linux")
       add_executable(dmdserver
-         src/dmdServer.cpp
+         src/server.cpp
          src/Logger.cpp
       )
       target_link_libraries(dmdserver PUBLIC dmdutil_shared)

include/DMDUtil/DMDServer.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <vector>
+
+#include "DMDUtil/DMD.h"
+#include "sockpp/tcp_acceptor.h"
+
+#define DMDSERVER_MAX_WIDTH 256
+#define DMDSERVER_MAX_HEIGHT 64
+
+namespace DMDUtil
+{
+
+class DMDUTILAPI DMDServer
+{
+ public:
+  DMDServer(DMD* dmd, bool fixedAltColorPath = false, bool fixedPupPath = false);
+  ~DMDServer();
+
+  bool Start(const char* addr, in_port_t port);
+  void Stop();
+  bool IsRunning() const { return m_running; }
+
+ private:
+  void AcceptLoop();
+  void ClientThread(sockpp::tcp_socket sock, uint32_t threadId);
+
+  DMD* m_dmd;
+  bool m_fixedAltColorPath;
+  bool m_fixedPupPath;
+  std::atomic<bool> m_running{false};
+  sockpp::tcp_acceptor m_acceptor;
+
+  uint32_t m_currentThreadId{0};
+  std::mutex m_threadMutex;
+  uint32_t m_disconnectOtherClients{0};
+  std::vector<uint32_t> m_threads;
+  std::thread* m_acceptThread{nullptr};
+};
+
+}  // namespace DMDUtil

include/DMDUtil/DMDUtil.h

@@ -17,3 +17,4 @@
 #include "LevelDMD.h"
 #include "RGB24DMD.h"
 #include "SceneGenerator.h"
+#include "DMDServer.h"