From 76d1ca9c283712cce85667de949403eecc4e92dc Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Wed, 18 Mar 2009 17:39:44 -0700 Subject: auto import from //branches/cupcake_rel/...@140373 --- arm-wt-22k/host_src/eas_hostmm.c | 7 +++++-- arm-wt-22k/host_src/jet.h | 2 +- arm-wt-22k/lib_src/jet.c | 8 +++++++- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'arm-wt-22k') diff --git a/arm-wt-22k/host_src/eas_hostmm.c b/arm-wt-22k/host_src/eas_hostmm.c index 132239b..d8eed8e 100644 --- a/arm-wt-22k/host_src/eas_hostmm.c +++ b/arm-wt-22k/host_src/eas_hostmm.c @@ -70,8 +70,11 @@ #endif #ifndef EAS_MAX_FILE_HANDLES -#define EAS_MAX_FILE_HANDLES 32 -#endif +// 100 max file handles == 3 * (nb tracks(32) + 1 for the segment) + 1 for jet file +// 3 == 1(playing segment) + 1(prepared segment) +// + 1(after end of playing segment, before files closed) +#define EAS_MAX_FILE_HANDLES 100 +#endif /* * this structure and the related function are here diff --git a/arm-wt-22k/host_src/jet.h b/arm-wt-22k/host_src/jet.h index b5bce00..35bdb6d 100644 --- a/arm-wt-22k/host_src/jet.h +++ b/arm-wt-22k/host_src/jet.h @@ -124,7 +124,7 @@ EAS_PUBLIC EAS_RESULT JET_Status (EAS_DATA_HANDLE easHandle, S_JET_STATUS *pStat * Checks for application events *---------------------------------------------------------------------------- */ -EAS_BOOL JET_GetEvent (EAS_DATA_HANDLE easHandle, EAS_U32 *pEventRaw, S_JET_EVENT *pEvent); +EAS_PUBLIC EAS_BOOL JET_GetEvent (EAS_DATA_HANDLE easHandle, EAS_U32 *pEventRaw, S_JET_EVENT *pEvent); /*---------------------------------------------------------------------------- * JET_ParseEvent() diff --git a/arm-wt-22k/lib_src/jet.c b/arm-wt-22k/lib_src/jet.c index bcb4e5e..ed7d465 100644 --- a/arm-wt-22k/lib_src/jet.c +++ b/arm-wt-22k/lib_src/jet.c @@ -569,7 +569,7 @@ EAS_PUBLIC EAS_RESULT JET_Status (EAS_DATA_HANDLE easHandle, S_JET_STATUS *pStat * Checks for application events *---------------------------------------------------------------------------- */ -EAS_BOOL JET_GetEvent (EAS_DATA_HANDLE easHandle, EAS_U32 *pEventRaw, S_JET_EVENT *pEvent) +EAS_PUBLIC EAS_BOOL JET_GetEvent (EAS_DATA_HANDLE easHandle, EAS_U32 *pEventRaw, S_JET_EVENT *pEvent) { EAS_U32 jetEvent; EAS_BOOL gotEvent; @@ -1117,6 +1117,12 @@ EAS_RESULT JET_Clear_Queue(EAS_DATA_HANDLE easHandle) return result; } } + + /* clear all clips */ + for (index = 0; index < JET_MUTE_QUEUE_SIZE ; index++) + { + easHandle->jetHandle->muteQueue[index] = 0; + } easHandle->jetHandle->flags &= ~JET_FLAGS_PLAYING; easHandle->jetHandle->playSegment = easHandle->jetHandle->queueSegment = 0; -- cgit v1.2.3