diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:31:05 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 15:31:05 -0700 |
| commit | 87aeac85330598f6a4809155ef51ba3f7107654c (patch) | |
| tree | 544ee5d055547a83e745d013493d485e8f38c5f0 /arm-wt-22k/lib_src/jet.c | |
| parent | b8f6bdf36a1ad24223a840f24cd1a232be8358e9 (diff) | |
| parent | a6b91a93965796319b0e09bafc1f5255110f1714 (diff) | |
| download | android_external_sonivox-87aeac85330598f6a4809155ef51ba3f7107654c.tar.gz android_external_sonivox-87aeac85330598f6a4809155ef51ba3f7107654c.tar.bz2 android_external_sonivox-87aeac85330598f6a4809155ef51ba3f7107654c.zip | |
Merge commit 'korg/cupcake'
Diffstat (limited to 'arm-wt-22k/lib_src/jet.c')
| -rw-r--r-- | arm-wt-22k/lib_src/jet.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arm-wt-22k/lib_src/jet.c b/arm-wt-22k/lib_src/jet.c index bcb4e5e..cc180af 100644 --- a/arm-wt-22k/lib_src/jet.c +++ b/arm-wt-22k/lib_src/jet.c @@ -26,11 +26,10 @@ *----------------------------------------------------------------------------
*/
-//FIXME: remove debug flag for release
-#define LOG_NDEBUG 0
+//#define LOG_NDEBUG 0
#define LOG_TAG "JET_C"
-#define DEBUG_JET
+//#define DEBUG_JET
#include "eas_data.h"
#include "eas_smf.h"
@@ -38,7 +37,6 @@ #include "eas_host.h"
#include "eas_report.h"
-#include <cutils/log.h>
/* default configuration */
static const S_JET_CONFIG jetDefaultConfig =
@@ -569,7 +567,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 +1115,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;
|