diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-08-05 14:56:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-05 14:56:23 +0000 |
| commit | 13c34e09fdfe0bcd2053368df4dd26028004d18f (patch) | |
| tree | e884b091f302facb3fc9661fddc90d267e80c881 /include | |
| parent | 6c104a4a245ea72b7bdf8c7c016121189045d4bc (diff) | |
| parent | 743732236ab84e94168378cdb293964861b1ed00 (diff) | |
| download | frameworks_av-13c34e09fdfe0bcd2053368df4dd26028004d18f.zip frameworks_av-13c34e09fdfe0bcd2053368df4dd26028004d18f.tar.gz frameworks_av-13c34e09fdfe0bcd2053368df4dd26028004d18f.tar.bz2 | |
Merge "Remove default parameters for AudioTrack"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioTrack.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 523bd32..aa2dd4e 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -170,9 +170,9 @@ public: */ AudioTrack( audio_stream_type_t streamType, - uint32_t sampleRate = 0, - audio_format_t format = AUDIO_FORMAT_DEFAULT, - audio_channel_mask_t channelMask = 0, + uint32_t sampleRate, + audio_format_t format, + audio_channel_mask_t, int frameCount = 0, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, @@ -194,10 +194,10 @@ public: */ AudioTrack( audio_stream_type_t streamType, - uint32_t sampleRate = 0, - audio_format_t format = AUDIO_FORMAT_DEFAULT, - audio_channel_mask_t channelMask = 0, - const sp<IMemory>& sharedBuffer = 0, + uint32_t sampleRate, + audio_format_t format, + audio_channel_mask_t channelMask, + const sp<IMemory>& sharedBuffer, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, void* user = NULL, @@ -227,10 +227,10 @@ public: * * threadCanCallJava: Whether callbacks are made from an attached thread and thus can call JNI. */ - status_t set(audio_stream_type_t streamType = AUDIO_STREAM_DEFAULT, - uint32_t sampleRate = 0, - audio_format_t format = AUDIO_FORMAT_DEFAULT, - audio_channel_mask_t channelMask = 0, + status_t set(audio_stream_type_t streamType, + uint32_t sampleRate, + audio_format_t format, + audio_channel_mask_t channelMask, int frameCount = 0, audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE, callback_t cbf = NULL, |