diff options
| author | Dima Zavin <dima@android.com> | 2011-04-27 17:13:46 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-27 17:13:46 -0700 |
| commit | 058520e9eea39d01fc4dd640a15cb85090e30e81 (patch) | |
| tree | 87e1db1e01d018a4283dca6c71d2c29418069f7f /include/media/AudioTrack.h | |
| parent | d21e7b5d542cc9e93526182272c2bdc995c816fb (diff) | |
| parent | 2986f5bed370709c10d24c058591d775e6092d89 (diff) | |
| download | frameworks_base-058520e9eea39d01fc4dd640a15cb85090e30e81.zip frameworks_base-058520e9eea39d01fc4dd640a15cb85090e30e81.tar.gz frameworks_base-058520e9eea39d01fc4dd640a15cb85090e30e81.tar.bz2 | |
Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73
* changes:
audioflinger: don't do work in constructor, instead do it in onFirstRef
audioflinger: enumerate all the possible audio interfaces
audio/media: convert to using the audio HAL and new audio defs
libmedia: move AudioParameter out of AudioSystem
audioflinger: move legacy audio hw/policy out to libhardware_legacy
Diffstat (limited to 'include/media/AudioTrack.h')
| -rw-r--r-- | include/media/AudioTrack.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 3e346db..de928da 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -30,7 +30,6 @@ #include <binder/IMemory.h> #include <utils/threads.h> - namespace android { // ---------------------------------------------------------------------------- @@ -126,11 +125,11 @@ public: * Parameters: * * streamType: Select the type of audio stream this track is attached to - * (e.g. AudioSystem::MUSIC). + * (e.g. AUDIO_STREAM_MUSIC). * sampleRate: Track sampling rate in Hz. - * format: Audio format (e.g AudioSystem::PCM_16_BIT for signed + * format: Audio format (e.g AUDIO_FORMAT_PCM_16_BIT for signed * 16 bits per sample). - * channels: Channel mask: see AudioSystem::audio_channels. + * channels: Channel mask: see audio_channels_t. * frameCount: Total size of track PCM buffer in frames. This defines the * latency of the track. * flags: Reserved for future use. |