diff options
-rw-r--r-- | arm-wt-22k/lib_src/eas_mdls.c | 10 | ||||
-rw-r--r-- | arm-wt-22k/lib_src/eas_public.c | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c index b08e24e..a510b80 100644 --- a/arm-wt-22k/lib_src/eas_mdls.c +++ b/arm-wt-22k/lib_src/eas_mdls.c @@ -603,8 +603,14 @@ EAS_RESULT DLSParser (EAS_HW_DATA_HANDLE hwInstData, EAS_FILE_HANDLE fileHandle, return EAS_ERROR_FILE_FORMAT; } - /* limit check */ - if ((dls.artCount == 0) || (dls.artCount > DLS_MAX_ART_COUNT)) + /* limit check - warn user if artCount is 0 and use default articulations */ + if ( dls.artCount == 0 ) + { + { /* dpp: EAS_ReportEx(_EAS_SEVERITY_WARNING, "DLS file contains 0 #articulations, using default.\n"); */ } + } + + /* limit check */ + if ( dls.artCount > DLS_MAX_ART_COUNT ) { { /* dpp: EAS_ReportEx(_EAS_SEVERITY_ERROR, "DLS file contains invalid #articulations [%u]\n", dls.regionCount); */ } return EAS_ERROR_FILE_FORMAT; diff --git a/arm-wt-22k/lib_src/eas_public.c b/arm-wt-22k/lib_src/eas_public.c index 51ac423..d0f6455 100644 --- a/arm-wt-22k/lib_src/eas_public.c +++ b/arm-wt-22k/lib_src/eas_public.c @@ -1662,10 +1662,6 @@ EAS_PUBLIC EAS_RESULT EAS_State (EAS_DATA_HANDLE pEASData, EAS_HANDLE pStream, E if (pStream->repeatCount && (*pState == EAS_STATE_STOPPED)) *pState = EAS_STATE_PLAY; - /* if we're not paused or pausing, we don't need to hide state from host */ - if (*pState != EAS_STATE_PAUSED && *pState != EAS_STATE_PAUSING) - return EAS_SUCCESS; - /* if stream is about to be paused, report it as paused */ if (pStream->streamFlags & STREAM_FLAGS_PAUSE) { @@ -1675,6 +1671,10 @@ EAS_PUBLIC EAS_RESULT EAS_State (EAS_DATA_HANDLE pEASData, EAS_HANDLE pStream, E *pState = EAS_STATE_PAUSING; } + /* if we're not paused or pausing, we don't need to hide state from host */ + if (*pState != EAS_STATE_PAUSED && *pState != EAS_STATE_PAUSING) + return EAS_SUCCESS; + /* if stream is about to resume, report it as playing */ if (pStream->streamFlags & STREAM_FLAGS_RESUME) *pState = EAS_STATE_PLAY; |