diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-09 21:32:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-09 21:32:54 +0000 |
| commit | 50b22c7717a1af8a1f2f90858b69431a3de468b5 (patch) | |
| tree | 0e8e96944089da2ee27a28459a219015adca222a | |
| parent | 95f0de7f26c487d468ff5a3b353af7d635de6d93 (diff) | |
| parent | 54a8a456c2b4b382b3ffe3d99e40703df79c0717 (diff) | |
| download | frameworks_av-50b22c7717a1af8a1f2f90858b69431a3de468b5.zip frameworks_av-50b22c7717a1af8a1f2f90858b69431a3de468b5.tar.gz frameworks_av-50b22c7717a1af8a1f2f90858b69431a3de468b5.tar.bz2 | |
Merge "AudioTrack::releaseBuffer parameter is const *"
| -rw-r--r-- | include/media/AudioTrack.h | 2 | ||||
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 23378ba..8baad6b 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -552,7 +552,7 @@ public: * */ // FIXME make private when obtainBuffer() for TRANSFER_OBTAIN is removed - void releaseBuffer(Buffer* audioBuffer); + void releaseBuffer(const Buffer* audioBuffer); /* As a convenience we provide a write() interface to the audio buffer. * Input parameter 'size' is in byte units. diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 3c3eadc..0713c66 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1338,7 +1338,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, const struct timespec *re return status; } -void AudioTrack::releaseBuffer(Buffer* audioBuffer) +void AudioTrack::releaseBuffer(const Buffer* audioBuffer) { // FIXME add error checking on mode, by adding an internal version if (mTransfer == TRANSFER_SHARED) { |