diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-26 21:08:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 21:08:12 +0000 |
| commit | 9b6fcc2f8294d21b859b4cbcff84107a499e221f (patch) | |
| tree | ef469d5dd64ebd0b6673163992650fba382c3be5 /include | |
| parent | 73ec11738cd4399c55d4905665a14a7c4cd42cbf (diff) | |
| parent | 684d47301aeddd137fb1ba2e42f9fb8b9e8a6a16 (diff) | |
| download | frameworks_av-9b6fcc2f8294d21b859b4cbcff84107a499e221f.zip frameworks_av-9b6fcc2f8294d21b859b4cbcff84107a499e221f.tar.gz frameworks_av-9b6fcc2f8294d21b859b4cbcff84107a499e221f.tar.bz2 | |
Merge "Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioEffect.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/media/AudioEffect.h b/include/media/AudioEffect.h index f3024b7..01dcbb2 100644 --- a/include/media/AudioEffect.h +++ b/include/media/AudioEffect.h @@ -217,8 +217,9 @@ public: * higher priorities, 0 being the normal priority. * cbf: optional callback function (see effect_callback_t) * user: pointer to context for use by the callback receiver. - * sessionID: audio session this effect is associated to. If 0, the effect will be global to - * the output mix. If not 0, the effect will be applied to all players + * sessionID: audio session this effect is associated to. + * If equal to AUDIO_SESSION_OUTPUT_MIX, the effect will be global to + * the output mix. Otherwise, the effect will be applied to all players * (AudioTrack or MediaPLayer) within the same audio session. * io: HAL audio output or input stream to which this effect must be attached. Leave at 0 for * automatic output selection by AudioFlinger. @@ -229,7 +230,7 @@ public: int32_t priority = 0, effect_callback_t cbf = NULL, void* user = NULL, - int sessionId = 0, + int sessionId = AUDIO_SESSION_OUTPUT_MIX, audio_io_handle_t io = 0 ); @@ -241,7 +242,7 @@ public: int32_t priority = 0, effect_callback_t cbf = NULL, void* user = NULL, - int sessionId = 0, + int sessionId = AUDIO_SESSION_OUTPUT_MIX, audio_io_handle_t io = 0 ); @@ -263,7 +264,7 @@ public: int32_t priority = 0, effect_callback_t cbf = NULL, void* user = NULL, - int sessionId = 0, + int sessionId = AUDIO_SESSION_OUTPUT_MIX, audio_io_handle_t io = 0 ); |