activated libpupdmd logging

vpinball · Mar 29, 2024 · 09867a8 · 09867a8
1 parent 3f96b5d
commit 09867a8
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 9 deletions.
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 if [[ $(uname) == "Linux" ]]; then
    NUM_PROCS=$(nproc)

diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 NUM_PROCS=$(sysctl -n hw.ncpu)
 

diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 NUM_PROCS=$(nproc)
 

diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 NUM_PROCS=$(nproc)
 

diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 NUM_PROCS=$(sysctl -n hw.ncpu)
 

diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 NUM_PROCS=$(sysctl -n hw.ncpu)
 

diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 NUM_PROCS=$(sysctl -n hw.ncpu)
 

diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"

diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
@@ -6,7 +6,7 @@ CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
 LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
-LIBPUPDMD_SHA=611ff0afcb051038cda46c8c6c68f9e9904d91ea
+LIBPUPDMD_SHA=de1401a521d0f88e2f5d182dfb14f7ce78d68679
 
 echo "Building libraries..."
 echo "  CARGS_SHA: ${CARGS_SHA}"

diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -25,6 +25,14 @@
 namespace DMDUtil
 {
 
+void PUPDMDCALLBACK PUPDMDLogCallback(const char* format, va_list args, const void* pUserData)
+{
+  char buffer[1024];
+  vsnprintf(buffer, sizeof(buffer), format, args);
+
+  Log("%s", buffer);
+}
+
 void ZEDMDCALLBACK ZeDMDLogCallback(const char* format, va_list args, const void* pUserData)
 {
   char buffer[1024];
@@ -1312,6 +1320,7 @@ void DMD::PupDMDThread()
           {
             if (m_pupPath[0] == '\0') strcpy(m_pupPath, Config::GetInstance()->GetPupPath());
             m_pPupDMD = new PUPDMD::DMD();
+            m_pPupDMD->SetLogCallback(PUPDMDLogCallback, nullptr);
 
             if (!m_pPupDMD->Load(m_pupPath, m_romName))
             {