Skip to content

moved network fuctions from header to cpp file #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsm174 merged 5 commits into from
Jun 20, 2025
Merged

moved network fuctions from header to cpp file #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
575e1dd
moved network fuctions from header to cpp file
mkalkbrenner Jun 16, 2025
59b90a1
moved includes
mkalkbrenner Jun 16, 2025
1a3a057
added dmd.cpp for dmdserver
mkalkbrenner Jun 16, 2025
d40401a
rverted adding dmd.cpp
mkalkbrenner Jun 16, 2025
51823ca
misc: fix windows build
jsm174 Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 4 additions & 61 deletions include/DMDUtil/DMD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
#define DMDUTIL_MAX_PATH_SIZE 256
#define DMDUTIL_MAX_TRANSITIONAL_FRAME_DURATION 25

#if defined(_WIN32) || defined(_WIN64)
#include <winsock2.h> // Windows byte-order functions
#else
#include <arpa/inet.h> // Linux/macOS byte-order functions
#endif

#include <atomic>
#include <condition_variable>
#include <cstdint>
Expand Down Expand Up @@ -129,43 +123,8 @@ class DMDUTILAPI DMD
uint16_t width;
uint16_t height;

void convertToHostByteOrder()
{
// uint8_t and bool are not converted, as they are already in host byte order.
mode = static_cast<Mode>(ntohl(static_cast<uint32_t>(mode)));
layout = static_cast<AlphaNumericLayout>(ntohl(static_cast<uint32_t>(layout)));
depth = ntohl(depth);
for (size_t i = 0; i < 256 * 64; i++)
{
segData[i] = ntohs(segData[i]);
}
for (size_t i = 0; i < 128; i++)
{
segData2[i] = ntohs(segData2[i]);
}
width = ntohs(width);
height = ntohs(height);
}

Update toNetworkByteOrder() const
{
// uint8_t and bool are not converted, as they are already in network byte order.
Update copy = *this;
copy.mode = static_cast<Mode>(htonl(static_cast<uint32_t>(mode)));
copy.layout = static_cast<AlphaNumericLayout>(htonl(static_cast<uint32_t>(layout)));
copy.depth = htonl(depth);
for (size_t i = 0; i < 256 * 64; i++)
{
copy.segData[i] = htons(segData[i]);
}
for (size_t i = 0; i < 128; i++)
{
copy.segData2[i] = htons(segData2[i]);
}
copy.width = htons(width);
copy.height = htons(height);
return copy;
}
DMDUTILAPI void convertToHostByteOrder();
DMDUTILAPI Update toNetworkByteOrder() const;
};

struct StreamHeader
Expand All @@ -179,23 +138,8 @@ class DMDUTILAPI DMD
uint8_t disconnectOthers = 0; // 0 => no, 1 => yes
uint32_t length = 0;

void convertToHostByteOrder()
{
// uint8_t and char are not converted, as they are already in host byte order.
mode = static_cast<Mode>(ntohl(static_cast<uint32_t>(mode)));
width = ntohs(width);
height = ntohs(height);
length = ntohl(length);
}

void convertToNetworkByteOrder()
{
// uint8_t and char are not converted, as they are already in network byte order.
mode = static_cast<Mode>(htonl(static_cast<uint32_t>(mode)));
width = htons(width);
height = htons(height);
length = htonl(length);
}
DMDUTILAPI void convertToHostByteOrder();
DMDUTILAPI void convertToNetworkByteOrder();
};

struct PathsHeader
Expand All @@ -206,7 +150,6 @@ class DMDUTILAPI DMD
char pupVideosPath[DMDUTIL_MAX_PATH_SIZE] = {0};

void convertToHostByteOrder() {}

void convertToNetworkByteOrder() {}
};
#pragma pack(pop) // Reset to default packing
Expand Down
102 changes: 82 additions & 20 deletions src/DMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
#include "DMDUtil/LevelDMD.h"
#include "DMDUtil/RGB24DMD.h"

#if defined(_WIN32) || defined(_WIN64)
#include <winsock2.h> // Windows byte-order functions
#else
#include <arpa/inet.h> // Linux/macOS byte-order functions
#endif

#if !( \
(defined(__APPLE__) && ((defined(TARGET_OS_IOS) && TARGET_OS_IOS) || (defined(TARGET_OS_TV) && TARGET_OS_TV))) || \
defined(__ANDROID__))
Expand Down Expand Up @@ -71,6 +77,62 @@ class DMDServerConnector

bool DMD::m_finding = false;

void DMD::Update::convertToHostByteOrder()
{
// uint8_t and bool are not converted, as they are already in host byte order.
mode = static_cast<Mode>(ntohl(static_cast<uint32_t>(mode)));
layout = static_cast<AlphaNumericLayout>(ntohl(static_cast<uint32_t>(layout)));
depth = ntohl(depth);
for (size_t i = 0; i < 256 * 64; i++)
{
segData[i] = ntohs(segData[i]);
}
for (size_t i = 0; i < 128; i++)
{
segData2[i] = ntohs(segData2[i]);
}
width = ntohs(width);
height = ntohs(height);
}

DMD::Update DMD::Update::toNetworkByteOrder() const
{
// uint8_t and bool are not converted, as they are already in network byte order.
Update copy = *this;
copy.mode = static_cast<Mode>(htonl(static_cast<uint32_t>(mode)));
copy.layout = static_cast<AlphaNumericLayout>(htonl(static_cast<uint32_t>(layout)));
copy.depth = htonl(depth);
for (size_t i = 0; i < 256 * 64; i++)
{
copy.segData[i] = htons(segData[i]);
}
for (size_t i = 0; i < 128; i++)
{
copy.segData2[i] = htons(segData2[i]);
}
copy.width = htons(width);
copy.height = htons(height);
return copy;
}

void DMD::StreamHeader::convertToHostByteOrder()
{
// uint8_t and char are not converted, as they are already in host byte order.
mode = static_cast<Mode>(ntohl(static_cast<uint32_t>(mode)));
width = ntohs(width);
height = ntohs(height);
length = ntohl(length);
}

void DMD::StreamHeader::convertToNetworkByteOrder()
{
// uint8_t and char are not converted, as they are already in network byte order.
mode = static_cast<Mode>(htonl(static_cast<uint32_t>(mode)));
width = htons(width);
height = htons(height);
length = htonl(length);
}

DMD::DMD()
{
for (uint8_t i = 0; i < DMDUTIL_FRAME_BUFFER_SIZE; i++)
Expand Down Expand Up @@ -622,8 +684,8 @@ void DMD::DmdFrameThread()
{
char name[DMDUTIL_MAX_NAME_SIZE] = {0};

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

while (true)
{
Expand Down Expand Up @@ -666,8 +728,8 @@ void DMD::ZeDMDThread()
uint8_t indexBuffer[256 * 64] = {0};
uint8_t renderBuffer[256 * 64 * 3] = {0};

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

Config* const pConfig = Config::GetInstance();
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
Expand Down Expand Up @@ -801,8 +863,8 @@ void DMD::SerumThread()
uint32_t nextRotation = 0;
Update* lastDmdUpdate = nullptr;

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

Config* const pConfig = Config::GetInstance();
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
Expand Down Expand Up @@ -1024,8 +1086,8 @@ void DMD::PixelcadeDMDThread()
uint8_t palette[PALETTE_SIZE] = {0};
uint16_t rgb565Data[128 * 32] = {0};

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

Config* const pConfig = Config::GetInstance();
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
Expand Down Expand Up @@ -1196,8 +1258,8 @@ void DMD::LevelDMDThread()
uint8_t bufferPosition = 0;
uint8_t renderBuffer[256 * 64] = {0};

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

while (true)
{
Expand Down Expand Up @@ -1243,8 +1305,8 @@ void DMD::RGB24DMDThread()
uint8_t renderBuffer[256 * 64] = {0};
uint8_t rgb24Data[256 * 64 * 3] = {0};

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

Config* const pConfig = Config::GetInstance();
bool showNotColorizedFrames = pConfig->IsShowNotColorizedFrames();
Expand Down Expand Up @@ -1391,8 +1453,8 @@ void DMD::ConsoleDMDThread()
uint8_t bufferPosition = 0;
uint8_t renderBuffer[256 * 64] = {0};

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

while (true)
{
Expand Down Expand Up @@ -1504,8 +1566,8 @@ void DMD::DumpDMDTxtThread()
FILE* f = nullptr;
std::unordered_set<uint64_t> seenHashes;

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

Config* const pConfig = Config::GetInstance();
bool dumpNotColorizedFrames = pConfig->IsDumpNotColorizedFrames();
Expand Down Expand Up @@ -1656,8 +1718,8 @@ void DMD::DumpDMDRawThread()
std::chrono::steady_clock::time_point start;
FILE* f = nullptr;

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

while (true)
{
Expand Down Expand Up @@ -1730,8 +1792,8 @@ void DMD::PupDMDThread()
uint8_t palette[192] = {0};
char name[DMDUTIL_MAX_NAME_SIZE] = {0};

m_dmdFrameReady.load(std::memory_order_acquire);
m_stopFlag.load(std::memory_order_acquire);
(void)m_dmdFrameReady.load(std::memory_order_acquire);
(void)m_stopFlag.load(std::memory_order_acquire);

while (true)
{
Expand Down