diff options
author | Eric Laurent <elaurent@google.com> | 2010-07-16 00:08:50 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-16 00:08:50 -0700 |
commit | b0374a0e22756d956f8ebf2b19b1139e9e5e3384 (patch) | |
tree | d43e4cfd91056deba883fe8fa1e0237f7cccc840 /include | |
parent | bd623daff1f261a0e794f059d90ba5907eb5a89a (diff) | |
parent | 76c40f74ced0b034a534ebc31ab9616425d3e711 (diff) | |
download | frameworks_base-b0374a0e22756d956f8ebf2b19b1139e9e5e3384.zip frameworks_base-b0374a0e22756d956f8ebf2b19b1139e9e5e3384.tar.gz frameworks_base-b0374a0e22756d956f8ebf2b19b1139e9e5e3384.tar.bz2 |
Merge "Several improvements in audio effects volume control." into gingerbread
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 |