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 | 39581f92482e000af2fe0575843d0752d164f9ae (patch) | |
| tree | a5e25c538fc7e781e8d9e400b94914c7c80b851f /include | |
| parent | 9ea03b9f29f6ec28ba4ced36c84328f48828f86d (diff) | |
| parent | 84569cc4e106ff4d6c6855b46e546572c5dda6b2 (diff) | |
| download | frameworks_base-39581f92482e000af2fe0575843d0752d164f9ae.zip frameworks_base-39581f92482e000af2fe0575843d0752d164f9ae.tar.gz frameworks_base-39581f92482e000af2fe0575843d0752d164f9ae.tar.bz2 | |
Merge "IAudioFlinger::createTrack and openRecord flags"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioRecord.h | 1 | ||||
| -rw-r--r-- | include/media/IAudioFlinger.h | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 7df6668..5bfb65b 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -354,7 +354,6 @@ private: audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, audio_io_handle_t input); audio_io_handle_t getInput_l(); status_t restoreRecord_l(audio_track_cblk_t*& cblk); diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 0f39cf3..2bae08e 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -43,6 +43,13 @@ class IAudioFlinger : public IInterface public: DECLARE_META_INTERFACE(AudioFlinger); + // or-able bits shared by createTrack and openRecord, but not all combinations make sense + enum { + TRACK_DEFAULT = 0, + TRACK_TIMED = 1, + }; + typedef uint32_t track_flags_t; + /* create an audio track and registers it with AudioFlinger. * return null if the track cannot be created. */ @@ -53,10 +60,9 @@ public: audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, + track_flags_t flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output, - bool isTimed, int *sessionId, status_t *status) = 0; @@ -67,7 +73,7 @@ public: audio_format_t format, uint32_t channelMask, int frameCount, - uint32_t flags, + track_flags_t flags, int *sessionId, status_t *status) = 0; |