diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-16 09:12:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-16 09:12:40 -0700 |
| commit | 521bcb0ff5054e5be40f5194026da3463504ae3b (patch) | |
| tree | 3d4771eb995a8ad56fa443d0a416558baf3dfd23 /include | |
| parent | a6163d6948d9a89670720eea8d30b59c5b70fe37 (diff) | |
| parent | c8f6b8569ac99f8b7e53b9687358642306fe3ee0 (diff) | |
| download | frameworks_av-521bcb0ff5054e5be40f5194026da3463504ae3b.zip frameworks_av-521bcb0ff5054e5be40f5194026da3463504ae3b.tar.gz frameworks_av-521bcb0ff5054e5be40f5194026da3463504ae3b.tar.bz2 | |
am f16b3f10: am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit 'f16b3f104f60738447db60bcf2c44c7610e17199'
* commit 'f16b3f104f60738447db60bcf2c44c7610e17199':
Several improvements in audio effects volume control.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/EffectApi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/EffectApi.h b/include/media/EffectApi.h index 9f3d0b6..8c120e5 100644 --- a/include/media/EffectApi.h +++ b/include/media/EffectApi.h @@ -455,7 +455,7 @@ enum effect_command_e { //-------------------------------------------------------------------------------------------------- // description: // Set and get volume. Used by audio framework to delegate volume control to effect engine. -// The effect implementation must set EFFECT_FLAG_VOLUME_IND and/or EFFECT_FLAG_VOLUME_CTRL flag in +// The effect implementation must set EFFECT_FLAG_VOLUME_IND or EFFECT_FLAG_VOLUME_CTRL flag in // its descriptor to receive this command before every call to process() function // If EFFECT_FLAG_VOLUME_CTRL flag is set in the effect descriptor, the effect engine must return // the volume that should be applied before the effect is processed. The overall volume (the volume |