diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-20 11:30:00 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2015-03-25 09:27:09 -0700 |
| commit | 0f5d69123490bb3c4fe26129dfd23e21ce184c88 (patch) | |
| tree | 0226e70e4bd45d61b940f60e24efc846c5af8244 /include/media | |
| parent | 3e414355fbed266916b446eaabbb3f9c153635b2 (diff) | |
| download | frameworks_av-0f5d69123490bb3c4fe26129dfd23e21ce184c88.zip frameworks_av-0f5d69123490bb3c4fe26129dfd23e21ce184c88.tar.gz frameworks_av-0f5d69123490bb3c4fe26129dfd23e21ce184c88.tar.bz2 | |
Remove deprecation FIXMEs for TRANSFER_OBTAIN mode
Change-Id: I7f43aabdb092e1465d79cd0eea5944fff18b93db
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioRecord.h | 9 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 10 |
2 files changed, 4 insertions, 15 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index fce5840..7be2c3e 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -123,7 +123,7 @@ public: enum transfer_type { TRANSFER_DEFAULT, // not specified explicitly; determine from the other parameters TRANSFER_CALLBACK, // callback EVENT_MORE_DATA - TRANSFER_OBTAIN, // FIXME deprecated: call obtainBuffer() and releaseBuffer() + TRANSFER_OBTAIN, // call obtainBuffer() and releaseBuffer() TRANSFER_SYNC, // synchronous read() }; @@ -344,9 +344,6 @@ public: * or return WOULD_BLOCK depending on the value of the "waitCount" * parameter. * - * obtainBuffer() and releaseBuffer() are deprecated for direct use by applications, - * which should use read() or callback EVENT_MORE_DATA instead. - * * Interpretation of waitCount: * +n limits wait time to n * WAIT_PERIOD_MS, * -1 causes an (almost) infinite wait time, @@ -367,9 +364,7 @@ public: * raw pointer to the buffer */ - /* FIXME Deprecated public API for TRANSFER_OBTAIN mode */ - status_t obtainBuffer(Buffer* audioBuffer, int32_t waitCount) - __attribute__((__deprecated__)); + status_t obtainBuffer(Buffer* audioBuffer, int32_t waitCount); private: /* If nonContig is non-NULL, it is an output parameter that will be set to the number of diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 818c8cd..d9b7057 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -137,7 +137,7 @@ public: enum transfer_type { TRANSFER_DEFAULT, // not specified explicitly; determine from the other parameters TRANSFER_CALLBACK, // callback EVENT_MORE_DATA - TRANSFER_OBTAIN, // FIXME deprecated: call obtainBuffer() and releaseBuffer() + TRANSFER_OBTAIN, // call obtainBuffer() and releaseBuffer() TRANSFER_SYNC, // synchronous write() TRANSFER_SHARED, // shared memory }; @@ -522,9 +522,6 @@ public: * or return WOULD_BLOCK depending on the value of the "waitCount" * parameter. * - * obtainBuffer() and releaseBuffer() are deprecated for direct use by applications, - * which should use write() or callback EVENT_MORE_DATA instead. - * * Interpretation of waitCount: * +n limits wait time to n * WAIT_PERIOD_MS, * -1 causes an (almost) infinite wait time, @@ -544,10 +541,8 @@ public: * size actual number of bytes available * raw pointer to the buffer */ - /* FIXME Deprecated public API for TRANSFER_OBTAIN mode */ status_t obtainBuffer(Buffer* audioBuffer, int32_t waitCount, - size_t *nonContig = NULL) - __attribute__((__deprecated__)); + size_t *nonContig = NULL); private: /* If nonContig is non-NULL, it is an output parameter that will be set to the number of @@ -571,7 +566,6 @@ public: * size actual number of bytes filled, must be multiple of frameSize * raw ignored */ - // FIXME make private when obtainBuffer() for TRANSFER_OBTAIN is removed void releaseBuffer(const Buffer* audioBuffer); /* As a convenience we provide a write() interface to the audio buffer. |