updated libzedmd, don't PixelcadeThread if no Pixelcade attached

vpinball · Feb 16, 2024 · 463aa09 · 463aa09
1 parent e07e0a4
commit 463aa09
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 if [[ $(uname) == "Linux" ]]; then

diff --git a/platforms/ios/arm64/external.sh b/platforms/ios/arm64/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 NUM_PROCS=$(sysctl -n hw.ncpu)

diff --git a/platforms/linux/aarch64/external.sh b/platforms/linux/aarch64/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 NUM_PROCS=$(nproc)

diff --git a/platforms/linux/x64/external.sh b/platforms/linux/x64/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 NUM_PROCS=$(nproc)

diff --git a/platforms/macos/arm64/external.sh b/platforms/macos/arm64/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 NUM_PROCS=$(sysctl -n hw.ncpu)

diff --git a/platforms/macos/x64/external.sh b/platforms/macos/x64/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 NUM_PROCS=$(sysctl -n hw.ncpu)

diff --git a/platforms/tvos/arm64/external.sh b/platforms/tvos/arm64/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 NUM_PROCS=$(sysctl -n hw.ncpu)

diff --git a/platforms/win/x64/external.sh b/platforms/win/x64/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 echo "Building libraries..."

diff --git a/platforms/win/x86/external.sh b/platforms/win/x86/external.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LIBZEDMD_SHA=44a8f03cd2f6c8c358714d871f4c716f447052ec
+LIBZEDMD_SHA=f7cab7910a347d744584274117f541182cd216d8
 LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
 
 echo "Building libraries..."

diff --git a/src/DMD.cpp b/src/DMD.cpp
@@ -358,7 +358,7 @@ void DMD::FindDisplays()
         if (pConfig->IsPixelcade())
         {
           pPixelcadeDMD = PixelcadeDMD::Connect(pConfig->GetPixelcadeDevice(), 128, 32);
-          m_pPixelcadeDMDThread = new std::thread(&DMD::PixelcadeDMDThread, this);
+          if (pPixelcadeDMD) m_pPixelcadeDMDThread = new std::thread(&DMD::PixelcadeDMDThread, this);
         }
 
         m_pPixelcadeDMD = pPixelcadeDMD;
@@ -561,7 +561,7 @@ void DMD::PixelcadeDMDThread()
     while (!m_stopFlag && bufferPosition != m_updateBufferPosition)
     {
       // @todo scaling
-      if (m_updateBuffer[bufferPosition]->width == 128 && m_updateBuffer[bufferPosition]->width == 32 &&
+      if (m_updateBuffer[bufferPosition]->width == 128 && m_updateBuffer[bufferPosition]->height == 32 &&
           (m_updateBuffer[bufferPosition]->hasData || m_updateBuffer[bufferPosition]->hasSegData))
       {
         int length = m_updateBuffer[bufferPosition]->width * m_updateBuffer[bufferPosition]->height;