diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:53 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:04:53 -0800 |
| commit | 5257e139e49727f9eaab95f4f9390f629ccfe06d (patch) | |
| tree | 02b02239299272961dbbadc72efb5d68521b69f9 /arm-wt-22k | |
| parent | e442bb7cd6a085b33a4dd52c0e20a157ada7feb1 (diff) | |
| download | android_external_sonivox-5257e139e49727f9eaab95f4f9390f629ccfe06d.tar.gz android_external_sonivox-5257e139e49727f9eaab95f4f9390f629ccfe06d.tar.bz2 android_external_sonivox-5257e139e49727f9eaab95f4f9390f629ccfe06d.zip | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'arm-wt-22k')
| -rw-r--r-- | arm-wt-22k/Android.mk | 6 | ||||
| -rw-r--r-- | arm-wt-22k/host_src/jet.h | 10 | ||||
| -rw-r--r-- | arm-wt-22k/lib_src/eas_data.h | 2 | ||||
| -rw-r--r-- | arm-wt-22k/lib_src/jet.c | 8 |
4 files changed, 24 insertions, 2 deletions
diff --git a/arm-wt-22k/Android.mk b/arm-wt-22k/Android.mk index 565c233..71fbcf8 100644 --- a/arm-wt-22k/Android.mk +++ b/arm-wt-22k/Android.mk @@ -35,6 +35,7 @@ LOCAL_SRC_FILES = \ lib_src/eas_xmf.c \ lib_src/eas_xmfdata.c \ lib_src/wt_22khz.c \ + lib_src/jet.c \ host_src/eas_config.c \ host_src/eas_hostmm.c \ host_src/eas_main.c \ @@ -70,7 +71,8 @@ LOCAL_COPY_HEADERS_TO := libsonivox LOCAL_COPY_HEADERS := \ host_src/eas.h \ host_src/eas_types.h \ - host_src/eas_reverb.h + host_src/eas_reverb.h \ + host_src/jet.h ifeq ($(TARGET_ARCH),arm) LOCAL_SRC_FILES+= \ @@ -94,7 +96,7 @@ LOCAL_COPY_HEADERS += lib_src/ARM_synth_constants_gnu.inc endif LOCAL_SHARED_LIBRARIES := \ - libutils + libutils libcutils LOCAL_LDLIBS := -lpthread diff --git a/arm-wt-22k/host_src/jet.h b/arm-wt-22k/host_src/jet.h index 8e7f984..fb83ec6 100644 --- a/arm-wt-22k/host_src/jet.h +++ b/arm-wt-22k/host_src/jet.h @@ -32,6 +32,11 @@ #include "eas_types.h"
#include "eas.h"
+/* for C++ linkage */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* opaque handle types for JET interface */
typedef struct s_jet_data_tag *JET_DATA_HANDLE;
@@ -174,5 +179,10 @@ EAS_PUBLIC EAS_RESULT JET_SetMuteFlag (EAS_DATA_HANDLE easHandle, EAS_INT trackN */
EAS_PUBLIC EAS_RESULT JET_TriggerClip (EAS_DATA_HANDLE easHandle, EAS_INT clipID);
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
+
#endif
diff --git a/arm-wt-22k/lib_src/eas_data.h b/arm-wt-22k/lib_src/eas_data.h index 0a47d04..28957fd 100644 --- a/arm-wt-22k/lib_src/eas_data.h +++ b/arm-wt-22k/lib_src/eas_data.h @@ -31,6 +31,8 @@ #ifndef _EAS_DATA_H
#define _EAS_DATA_H
+#define JET_INTERFACE
+
#include "eas_types.h"
#include "eas_synthcfg.h"
#include "eas.h"
diff --git a/arm-wt-22k/lib_src/jet.c b/arm-wt-22k/lib_src/jet.c index a59ef65..864ee24 100644 --- a/arm-wt-22k/lib_src/jet.c +++ b/arm-wt-22k/lib_src/jet.c @@ -26,12 +26,20 @@ *----------------------------------------------------------------------------
*/
+//FIXME: remove debug flag for release
+#define LOG_NDEBUG 0
+#define LOG_TAG "JET_C"
+
+#define DEBUG_JET
+
#include "eas_data.h"
#include "eas_smf.h"
#include "jet_data.h"
#include "eas_host.h"
#include "eas_report.h"
+#include <cutils/log.h>
+
/* default configuration */
static const S_JET_CONFIG jetDefaultConfig =
{
|