diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-08-22 11:09:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-22 11:09:58 -0700 |
| commit | 4aa73099649056a39bd37e090c1fedd07c1ccbd5 (patch) | |
| tree | c5029af24115fba7e9ea55afd77e2da96bf099ed /services | |
| parent | 445e9d6da8a953492af126e2e1406dedda3b4343 (diff) | |
| parent | 916ecd0acb4c12568d029c027a7626fc422bd84c (diff) | |
| download | frameworks_av-4aa73099649056a39bd37e090c1fedd07c1ccbd5.zip frameworks_av-4aa73099649056a39bd37e090c1fedd07c1ccbd5.tar.gz frameworks_av-4aa73099649056a39bd37e090c1fedd07c1ccbd5.tar.bz2 | |
am 916ecd0a: am 0c676cd0: Make tee sink compile OK again
* commit '916ecd0acb4c12568d029c027a7626fc422bd84c':
Make tee sink compile OK again
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/PipeReader.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/PipeReader.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/PipeReader.cpp b/services/audioflinger/PipeReader.cpp index df3ee04..529d478 100644 --- a/services/audioflinger/PipeReader.cpp +++ b/services/audioflinger/PipeReader.cpp @@ -59,7 +59,7 @@ ssize_t PipeReader::availableToRead() return avail; } -ssize_t PipeReader::read(void *buffer, size_t count) +ssize_t PipeReader::read(void *buffer, size_t count, int64_t readPTS) { ssize_t avail = availableToRead(); if (CC_UNLIKELY(avail <= 0)) { diff --git a/services/audioflinger/PipeReader.h b/services/audioflinger/PipeReader.h index 398353b..350e6ab 100644 --- a/services/audioflinger/PipeReader.h +++ b/services/audioflinger/PipeReader.h @@ -45,7 +45,7 @@ public: virtual ssize_t availableToRead(); - virtual ssize_t read(void *buffer, size_t count); + virtual ssize_t read(void *buffer, size_t count, int64_t readPTS); // NBAIO_Source end |