diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-26 07:16:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-26 07:16:37 -0700 |
| commit | b83d38feeeb88a8a2a6219e1fca2480b5a14fb0d (patch) | |
| tree | 7e1392f0427d0300d8140ef0a6c18dc32f393831 /services/audioflinger | |
| parent | 8f7f7ad54c698cb57a2a369cf1ae5b917853917b (diff) | |
| parent | a075db4ff9b086ac2885df77bb6da0869293df92 (diff) | |
| download | frameworks_av-b83d38feeeb88a8a2a6219e1fca2480b5a14fb0d.zip frameworks_av-b83d38feeeb88a8a2a6219e1fca2480b5a14fb0d.tar.gz frameworks_av-b83d38feeeb88a8a2a6219e1fca2480b5a14fb0d.tar.bz2 | |
Merge "IAudioFlinger::createTrack and openRecord flags"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 8 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index e92e69c..c5ad0f5 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -442,11 +442,9 @@ sp<IAudioTrack> AudioFlinger::createTrack( audio_format_t format, uint32_t channelMask, int frameCount, - // FIXME dead, remove from IAudioFlinger - uint32_t flags, + IAudioFlinger::track_flags_t flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output, - bool isTimed, int *sessionId, status_t *status) { @@ -504,6 +502,7 @@ sp<IAudioTrack> AudioFlinger::createTrack( } ALOGV("createTrack() lSessionId: %d", lSessionId); + bool isTimed = (flags & IAudioFlinger::TRACK_TIMED) != 0; track = thread->createTrack_l(client, streamType, sampleRate, format, channelMask, frameCount, sharedBuffer, lSessionId, isTimed, &lStatus); @@ -4676,8 +4675,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( audio_format_t format, uint32_t channelMask, int frameCount, - // FIXME dead, remove from IAudioFlinger - uint32_t flags, + IAudioFlinger::track_flags_t flags, int *sessionId, status_t *status) { diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index d1950a3..795807d 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -87,10 +87,9 @@ public: audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, + IAudioFlinger::track_flags_t flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output, - bool isTimed, int *sessionId, status_t *status); @@ -101,7 +100,7 @@ public: audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, + IAudioFlinger::track_flags_t flags, int *sessionId, status_t *status); |