Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5473434f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ... 

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

Merge commit '97eb728a' into gingerbread-plus-aosp

* commit '97eb728a':
  Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
parents e69204a0 97eb728a

include/media/EffectEqualizerApi.h

+3 −4
Original line number Diff line number Diff line
@@ -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

{

media/libeffects/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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