Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.

Browse Source 
Merge commit '97eb728aef51646b86925557a36732598e3fbaa1' into gingerbread-plus-aosp

* commit '97eb728aef51646b86925557a36732598e3fbaa1':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
This commit is contained in:
Jean-Michel Trivi
2010-07-14 11:12:14 -07:00
committed by Android Git Automerger
parent e69204a02a 97eb728aef
commit 5473434f06
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/media/EffectEqualizerApi.h
View File

@@ -19,14 +19,13 @@
#include <media/EffectApi.h>
// for the definition of SL_IID_EQUALIZER
#include "OpenSLES.h"
#if __cplusplus
extern "C" {
#endif
//TODO replace by openSL ES include when available
static const effect_uuid_t SL_IID_EQUALIZER_ = { 0x0bed4300, 0xddd6, 0x11db, 0x8f34, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } };
const effect_uuid_t * const SL_IID_EQUALIZER = &SL_IID_EQUALIZER_;
/* enumerated parameters for Equalizer effect */
typedef enum
{

3
media/libeffects/Android.mk
View File

@@ -87,7 +87,8 @@ LOCAL_SHARED_LIBRARIES += libdl
endif
LOCAL_C_INCLUDES := \
$(call include-path-for, graphics corecg)
$(call include-path-for, graphics corecg) \
system/media/opensles/include
LOCAL_PRELINK_MODULE := false