am 03e7ec95: Merge "Tweaks for forward-compatibility"

* commit '03e7ec959823279937ceae1290b938c4b0b68317':
  Tweaks for forward-compatibility

2 files changed, 27 insertions, 0 deletions

diff --git a/include/hardware/audio.h b/include/hardware/audio.h
index a4aa0d27..36ff3995 100644
--- a/include/hardware/audio.h
+++ b/include/hardware/audio.h
@@ -27,6 +27,7 @@
 
 #include <hardware/hardware.h>
 #include <system/audio.h>
+#include <hardware/audio_effect.h>
 
 __BEGIN_DECLS
 
@@ -116,6 +117,10 @@ struct audio_stream {
      */
     char * (*get_parameters)(const struct audio_stream *stream,
                              const char *keys);
+    int (*add_audio_effect)(const struct audio_stream *stream,
+                             effect_handle_t effect);
+    int (*remove_audio_effect)(const struct audio_stream *stream,
+                             effect_handle_t effect);
 };
 typedef struct audio_stream audio_stream_t;
 
diff --git a/include/hardware/audio_effect.h b/include/hardware/audio_effect.h
new file mode 100644
index 00000000..540f5ed4
--- /dev/null
+++ b/include/hardware/audio_effect.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_AUDIO_EFFECT_H
+#define ANDROID_AUDIO_EFFECT_H
+
+typedef void *effect_handle_t;
+
+#endif  // ANDROID_AUDIO_EFFECT_H