forward declaration of serum struct

vpinball · May 17, 2024 · 5b55c51 · 5b55c51
1 parent a127174
commit 5b55c51
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/include/DMDUtil/DMD.h b/include/DMDUtil/DMD.h
@@ -23,14 +23,17 @@
 #include <string>
 #include <thread>
 
-#include "serum.h"
 #include "sockpp/tcp_connector.h"
 
 #if defined(__APPLE__)
 #include <TargetConditionals.h>
 #endif
 
 class ZeDMD;
+
+struct _Serum_Frame_Struc;
+typedef _Serum_Frame_Struc SerumFrameStruct;
+
 namespace PUPDMD
 {
 class DMD;
@@ -192,7 +195,7 @@ class DMDUTILAPI DMD
   char m_altColorPath[DMDUTIL_MAX_PATH_SIZE] = {0};
   char m_pupVideosPath[DMDUTIL_MAX_PATH_SIZE] = {0};
   AlphaNumeric* m_pAlphaNumeric;
-  Serum_Frame_Struc* m_pSerum;
+  SerumFrameStruct* m_pSerum;
   ZeDMD* m_pZeDMD;
   PUPDMD::DMD* m_pPUPDMD;
   std::vector<LevelDMD*> m_levelDMDs;

diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
@@ -4,7 +4,7 @@ set -e
 
 CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=6395357ce400036432587b4f696a2fac14ddd21a
-LIBSERUM_SHA=16e02e2c9e4be74c89cd5e03fc86675238ab9267
+LIBSERUM_SHA=3a313cb7851b21631ef56193a441903a2e90df43
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
 LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
 LIBFRAMEUTIL_SHA=30048ca23d41ca0a8f7d5ab75d3f646a19a90182

diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -20,6 +20,7 @@
 #include "Logger.h"
 #include "ZeDMD.h"
 #include "pupdmd.h"
+#include "serum.h"
 #include "serum-decode.h"
 
 namespace DMDUtil