Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion platforms/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

LIBZEDMD_SHA=cb969273720234df2f11f2fd7c81fe375f83cfe2
LIBSERUM_SHA=188f45d375e47b0f21c8df3c4ff1a24cf8ec9c3b
LIBSERUM_SHA=2da4ca73fb4f30f99b998345ff42cf426180fd57
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

if [ -z "${BUILD_TYPE}" ]; then
Expand Down
18 changes: 16 additions & 2 deletions src/DMD.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1026,11 +1026,12 @@ void DMD::SerumThread()

if (m_altColorPath[0] == '\0') strcpy(m_altColorPath, Config::GetInstance()->GetAltColorPath());
flags = 0;

// At the moment, ZeDMD HD and RGB24DMD are the only devices supporting 64P frames. Not requesting 64P
// saves memory.
if (m_pZeDMD)
{
if (m_pZeDMD->GetWidth() == 256)
if (m_pZeDMD->GetHeight() == 64)
flags |= FLAG_REQUEST_64P_FRAMES;
else
flags |= FLAG_REQUEST_32P_FRAMES;
Expand All @@ -1040,7 +1041,18 @@ void DMD::SerumThread()
{
for (RGB24DMD* pRGB24DMD : m_rgb24DMDs)
{
if (pRGB24DMD->GetWidth() == 256)
if (pRGB24DMD->GetHeight() == 64)
flags |= FLAG_REQUEST_64P_FRAMES;
else
flags |= FLAG_REQUEST_32P_FRAMES;
}
}

if (m_levelDMDs.size() > 0)
{
for (LevelDMD* pLevelDMD : m_levelDMDs)
{
if (pLevelDMD->GetHeight() == 64)
flags |= FLAG_REQUEST_64P_FRAMES;
else
flags |= FLAG_REQUEST_32P_FRAMES;
Expand All @@ -1053,6 +1065,8 @@ void DMD::SerumThread()
if (m_pPixelcadeDMD) flags |= FLAG_REQUEST_32P_FRAMES;
#endif

if (!flags) flags |= FLAG_REQUEST_32P_FRAMES;

m_pSerum = (name[0] != '\0') ? Serum_Load(m_altColorPath, m_romName, flags) : nullptr;
if (m_pSerum)
{
Expand Down