Skip to content

fix EAS_SetSoundLibrary and EAS_LoadDLSCollection #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rsp4jack merged 1 commit into from
Jan 31, 2026
Merged

fix EAS_SetSoundLibrary and EAS_LoadDLSCollection #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 30 additions & 10 deletions arm-wt-22k/lib_src/eas_public.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2462,11 +2462,21 @@ EAS_PUBLIC EAS_RESULT EAS_MetricsReset (EAS_DATA_HANDLE pEASData)
*/
EAS_PUBLIC EAS_RESULT EAS_SetSoundLibrary (EAS_DATA_HANDLE pEASData, EAS_HANDLE pStream, EAS_SNDLIB_HANDLE pSndLib)
{
if (pStream)
if (pStream != NULL)
{
if (pStream->pParserModule != NULL)
{
if (!EAS_StreamReady(pEASData, pStream))
return EAS_ERROR_NOT_VALID_IN_THIS_STATE;
return EAS_ERROR_NOT_VALID_IN_THIS_STATE;
return EAS_IntSetStrmParam(pEASData, pStream, PARSER_DATA_EAS_LIBRARY, (EAS_IPTR) pSndLib);
}
else if (pStream->handle != NULL)
{
S_INTERACTIVE_MIDI *pMIDIStream = (S_INTERACTIVE_MIDI *) pStream->handle;
return VMSetEASLib(pMIDIStream->pSynth, pSndLib);
}
else
return EAS_FAILURE;
}

return VMSetGlobalEASLib(pEASData->pVoiceMgr, pSndLib);
Expand Down Expand Up @@ -2537,7 +2547,7 @@ EAS_PUBLIC EAS_RESULT EAS_LoadDLSCollection (EAS_DATA_HANDLE pEASData, EAS_HANDL
EAS_RESULT result;
EAS_DLSLIB_HANDLE pDLS;

if (pStream != NULL)
if (pStream != NULL && pStream->pParserModule != NULL)
{
if (!EAS_StreamReady(pEASData, pStream))
return EAS_ERROR_NOT_VALID_IN_THIS_STATE;
Expand All @@ -2553,14 +2563,24 @@ EAS_PUBLIC EAS_RESULT EAS_LoadDLSCollection (EAS_DATA_HANDLE pEASData, EAS_HANDL

if (result == EAS_SUCCESS)
{

/* if a stream pStream is specified, point it to the DLS collection */
if (pStream)
result = EAS_IntSetStrmParam(pEASData, pStream, PARSER_DATA_DLS_COLLECTION, (EAS_IPTR) pDLS);

/* global DLS load */
/* if a stream pStream is specified, point it to the DLS collection */
if (pStream != NULL)
{
if (pStream->pParserModule != NULL)
{
result = EAS_IntSetStrmParam(pEASData, pStream, PARSER_DATA_DLS_COLLECTION, (EAS_IPTR) pDLS);
}
else if (pStream->handle != NULL)
{
S_INTERACTIVE_MIDI *pMIDIStream = (S_INTERACTIVE_MIDI *) pStream->handle;
result = VMSetDLSLib(pMIDIStream->pSynth, pDLS);
}
else
result = VMSetGlobalDLSLib(pEASData, pDLS);
result = EAS_FAILURE;
}
/* global DLS load */
else
result = VMSetGlobalDLSLib(pEASData, pDLS);
}

return result;
Expand Down