From a6d5de4a70e1f744bf5b5274eed5583bf134669f Mon Sep 17 00:00:00 2001 From: Cuyler36 Date: Sat, 21 Jun 2025 09:55:09 -0400 Subject: [PATCH] jaudio_NES: link seqsetup --- configure.py | 2 +- src/static/jaudio_NES/internal/seqsetup.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/configure.py b/configure.py index 0ea79f63..574ff60b 100644 --- a/configure.py +++ b/configure.py @@ -787,7 +787,7 @@ config.libs = [ Object(NonMatching, "jaudio_NES/internal/oneshot.c"), Object(NonMatching, "jaudio_NES/internal/rate.c"), Object(NonMatching, "jaudio_NES/internal/rspsim.c"), - Object(NonMatching, "jaudio_NES/internal/seqsetup.c"), + Object(Matching, "jaudio_NES/internal/seqsetup.c"), Object(Equivalent, "jaudio_NES/internal/system.c"), Object(Matching, "jaudio_NES/internal/tables.c"), Object(Matching, "jaudio_NES/internal/waveread.c"), diff --git a/src/static/jaudio_NES/internal/seqsetup.c b/src/static/jaudio_NES/internal/seqsetup.c index 58880798..911d536e 100644 --- a/src/static/jaudio_NES/internal/seqsetup.c +++ b/src/static/jaudio_NES/internal/seqsetup.c @@ -104,8 +104,8 @@ static seqp_* GetNewTrack() } track = FREE_SEQP_QUEUE[GET_P]; - ++GET_P; --SEQ_REMAIN; + ++GET_P; if (GET_P == FREE_SEQP_QUEUE_SIZE) { GET_P = 0; @@ -486,8 +486,6 @@ s32 Jaq_OpenTrack(seqp_* track, u32 flags, u32 source) u8 childIndex; u8 trackFlags; - u8* REF_index; - childIndex = (flags & 0b00001111); trackFlags = (flags & 0b11000000) >> 6; if ((flags & 0b00100000)) { @@ -498,7 +496,6 @@ s32 Jaq_OpenTrack(seqp_* track, u32 flags, u32 source) childIndex = Jam_ReadRegDirect(track, childIndex); } - REF_index = &childIndex; if (childIndex >= 16) { return -1; } @@ -515,7 +512,8 @@ s32 Jaq_OpenTrack(seqp_* track, u32 flags, u32 source) track->children[childIndex] = newChildTrack; - newChildTrack->trackId = ((track->trackId << 4 | childIndex) & 0xFFFFFFF) | ((track->trackId & 0xF0000000) + 0x10000000); + u32 trackId = track->trackId; + newChildTrack->trackId = ((trackId << 4 | childIndex) & 0xFFFFFFF) | ((trackId & 0xF0000000) + 0x10000000); newChildTrack->connectionId = 0; newChildTrack->dataSourceMode = track->dataSourceMode; newChildTrack->flags = trackFlags;