summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2011-06-15 17:22:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-15 17:22:09 -0700
commit8b565a4139cb37b0682b44cf9a16525ebf6c2058 (patch)
tree640cdb789d0733cb1f97e4761b8d8b4083b4614c
parent87c9a6bbe9dabec3d795675ab0ef74a773cc1670 (diff)
downloadandroid_frameworks_wilhelm-8b565a4139cb37b0682b44cf9a16525ebf6c2058.tar.gz
android_frameworks_wilhelm-8b565a4139cb37b0682b44cf9a16525ebf6c2058.tar.bz2
android_frameworks_wilhelm-8b565a4139cb37b0682b44cf9a16525ebf6c2058.zip
Revert "voice processing"
This reverts commit 7585d227843769079ee2afb385607b3e23ac1e07
-rw-r--r--src/android/android_Effect.cpp6
-rw-r--r--src/itf/IBassBoost.c2
-rw-r--r--src/itf/IEnvironmentalReverb.c2
-rw-r--r--src/itf/IEqualizer.c2
-rw-r--r--src/itf/IVirtualizer.c2
5 files changed, 9 insertions, 5 deletions
diff --git a/src/android/android_Effect.cpp b/src/android/android_Effect.cpp
index 0e054e7..c62ac1b 100644
--- a/src/android/android_Effect.cpp
+++ b/src/android/android_Effect.cpp
@@ -18,7 +18,11 @@
#include "sles_allinclusive.h"
#include "math.h"
#include "utils/RefBase.h"
-#include "hardware/audio_effect.h"
+#include "media/EffectEqualizerApi.h"
+#include "media/EffectBassBoostApi.h"
+#include "media/EffectVirtualizerApi.h"
+#include "media/EffectPresetReverbApi.h"
+#include "media/EffectEnvironmentalReverbApi.h"
#include <system/audio.h>
diff --git a/src/itf/IBassBoost.c b/src/itf/IBassBoost.c
index 39114ad..20ae501 100644
--- a/src/itf/IBassBoost.c
+++ b/src/itf/IBassBoost.c
@@ -18,7 +18,7 @@
#include "sles_allinclusive.h"
#ifdef ANDROID
-#include "hardware/audio_effect.h"
+#include "media/EffectBassBoostApi.h"
#endif
#define BASSBOOST_STRENGTH_MIN 0
diff --git a/src/itf/IEnvironmentalReverb.c b/src/itf/IEnvironmentalReverb.c
index 86a2d6d..c54ba33 100644
--- a/src/itf/IEnvironmentalReverb.c
+++ b/src/itf/IEnvironmentalReverb.c
@@ -18,7 +18,7 @@
#include "sles_allinclusive.h"
#ifdef ANDROID
-#include "hardware/audio_effect.h"
+#include "media/EffectEnvironmentalReverbApi.h"
#endif
// Note: all Set operations use exclusive not poke,
diff --git a/src/itf/IEqualizer.c b/src/itf/IEqualizer.c
index c08543e..b9a595f 100644
--- a/src/itf/IEqualizer.c
+++ b/src/itf/IEqualizer.c
@@ -18,7 +18,7 @@
#include "sles_allinclusive.h"
#ifdef ANDROID
-#include "hardware/audio_effect.h"
+#include "media/EffectEqualizerApi.h"
#endif
#define MAX_EQ_PRESETS 3
diff --git a/src/itf/IVirtualizer.c b/src/itf/IVirtualizer.c
index 01e8edd..ff1ef15 100644
--- a/src/itf/IVirtualizer.c
+++ b/src/itf/IVirtualizer.c
@@ -18,7 +18,7 @@
#include "sles_allinclusive.h"
#ifdef ANDROID
-#include "hardware/audio_effect.h"
+#include "media/EffectVirtualizerApi.h"
#endif
#define VIRTUALIZER_STRENGTH_MIN 0