diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-07-14 11:15:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-14 11:15:31 -0700 |
| commit | 8972e1a30cd9b57a238a2ef617ed340d8043eb44 (patch) | |
| tree | 69c5092a41dfb186bc6f6033ecbad7bafe25b3a5 /include | |
| parent | 1ba17bb023afda0d49d9bbc29e2777b91776d287 (diff) | |
| parent | f521a09357182b81b69f91466533f10bdf909bf0 (diff) | |
| download | frameworks_av-8972e1a30cd9b57a238a2ef617ed340d8043eb44.zip frameworks_av-8972e1a30cd9b57a238a2ef617ed340d8043eb44.tar.gz frameworks_av-8972e1a30cd9b57a238a2ef617ed340d8043eb44.tar.bz2 | |
am 5473434f: am 97eb728a: Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ effect UUID instead of defining it locally.
Merge commit '5473434f060d8c036a30a1992b036a2f70da265d'
* commit '5473434f060d8c036a30a1992b036a2f70da265d':
Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQ
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/EffectEqualizerApi.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/media/EffectEqualizerApi.h b/include/media/EffectEqualizerApi.h index e3069d5..cb05b32 100644 --- a/include/media/EffectEqualizerApi.h +++ b/include/media/EffectEqualizerApi.h @@ -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 { |