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 | 659004c2949620d8adb29e1d950a2dd1c75ba9a9 (patch) | |
| tree | 0619d1c2fa1515119ddd92648724e89a1073e76a /include/media/AudioTrack.h | |
| parent | 755e8e1dcf36f282b727ff22d87d3c2fac70d30a (diff) | |
| parent | b1c0993b215c5c3eebd1c6bafc22bba23d57a70b (diff) | |
| download | frameworks_av-659004c2949620d8adb29e1d950a2dd1c75ba9a9.zip frameworks_av-659004c2949620d8adb29e1d950a2dd1c75ba9a9.tar.gz frameworks_av-659004c2949620d8adb29e1d950a2dd1c75ba9a9.tar.bz2 | |
Merge "Add all-channel AudioTrack::setVolume() API"
Diffstat (limited to 'include/media/AudioTrack.h')
| -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. |