diff options
| author | Phil Burk <philburk@google.com> | 2019-08-29 14:17:27 -0700 |
|---|---|---|
| committer | Phil Burk <philburk@google.com> | 2019-08-29 14:17:27 -0700 |
| commit | a4ddbec088586d9225b408d7be4d6ba4e70a9b11 (patch) | |
| tree | 991b36eaf465d2b12e53fa897389a766c013715d /include | |
| parent | 9ffbcb65637c3e9a8d1b4f689deb8d53325f5c66 (diff) | |
| download | oboe-a4ddbec088586d9225b408d7be4d6ba4e70a9b11.tar.gz | |
resampler: fix some merge errors
Diffstat (limited to 'include')
| -rw-r--r-- | include/oboe/AudioStream.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/oboe/AudioStream.h b/include/oboe/AudioStream.h index d7d769b3..1f7954ed 100644 --- a/include/oboe/AudioStream.h +++ b/include/oboe/AudioStream.h @@ -304,9 +304,7 @@ public: * @return a FrameTimestamp containing the position and time at which a particular audio frame * entered or left the audio processing pipeline, or an error if the operation failed. */ - virtual ResultWithValue<FrameTimestamp> getTimestamp(clockid_t /* clockId */){ - return Result::ErrorUnimplemented; - } + virtual ResultWithValue<FrameTimestamp> getTimestamp(clockid_t /* clockId */); // ============== I/O =========================== /** |