diff options
author | Glenn Kasten <gkasten@google.com> | 2012-11-08 10:35:06 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-08 10:35:07 -0800 |
commit | 1ec74dab269d21535a89d058da82a7d28aacbb12 (patch) | |
tree | 66e55e23d27ce8a9eaa6c78e7bf396f2acf47480 /include/media | |
parent | 4f3ebe4090a3be3bb7622cc01b2f9af476914798 (diff) | |
parent | 164d6539e0620d08b0395efcdd0e4aaf437daf54 (diff) | |
download | frameworks_av-1ec74dab269d21535a89d058da82a7d28aacbb12.zip frameworks_av-1ec74dab269d21535a89d058da82a7d28aacbb12.tar.gz frameworks_av-1ec74dab269d21535a89d058da82a7d28aacbb12.tar.bz2 |
Merge "Add all-channel AudioTrack::setVolume() API"
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/AudioTrack.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 1a19999..5f235cb 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -265,9 +265,14 @@ public: /* Set volume for this track, mostly used for games' sound effects * left and right volumes. Levels must be >= 0.0 and <= 1.0. + * This is the older API. New applications should use setVolume(float) when possible. */ status_t setVolume(float left, float right); - void getVolume(float* left, float* right) const; + + /* Set volume for all channels. This is the preferred API for new applications, + * especially for multi-channel content. + */ + status_t setVolume(float volume); /* Set the send level for this track. An auxiliary effect should be attached * to the track with attachEffect(). Level must be >= 0.0 and <= 1.0. |