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 | 2469e40924050797f0a4c059b01eff65539d2445 (patch) | |
tree | c5972e7e504aad0e612d520452a261fb3be1a6db /include | |
parent | 94919a170fab66e7903bea0c10093234e5e6cd37 (diff) | |
parent | f16b3f104f60738447db60bcf2c44c7610e17199 (diff) | |
download | frameworks_base-2469e40924050797f0a4c059b01eff65539d2445.zip frameworks_base-2469e40924050797f0a4c059b01eff65539d2445.tar.gz frameworks_base-2469e40924050797f0a4c059b01eff65539d2445.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 |