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 | ada2ac8e09b6d3f2b3c3155a852ba0fffae1b592 (patch) | |
tree | de59f8968f64985ba7a37aeb0305daa85ee0bc03 /include | |
parent | 59f566c4ec3dfc097ad8163523e522280b27e5c3 (diff) | |
parent | cab112421da6e8eac19ffddbbe3d76067cffee78 (diff) | |
download | frameworks_av-ada2ac8e09b6d3f2b3c3155a852ba0fffae1b592.zip frameworks_av-ada2ac8e09b6d3f2b3c3155a852ba0fffae1b592.tar.gz frameworks_av-ada2ac8e09b6d3f2b3c3155a852ba0fffae1b592.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 |