summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-08-29 17:09:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-29 17:09:37 -0700
commitf94b2946a511c5cbb6b9001449ca8278cb332bda (patch)
tree65bcaa09c8ffb831340fcc9bb92b91d190ec4e46 /services/audioflinger/AudioFlinger.h
parent73e4f3d44f7022b03943ae34f08363e049e4b46f (diff)
parent56b592240073b1ab116c6e23a9c4c34ef5ad80d8 (diff)
downloadframeworks_av-f94b2946a511c5cbb6b9001449ca8278cb332bda.zip
frameworks_av-f94b2946a511c5cbb6b9001449ca8278cb332bda.tar.gz
frameworks_av-f94b2946a511c5cbb6b9001449ca8278cb332bda.tar.bz2
am 56b59224: Merge "Add IAudioTrack::getTimestamp()" into klp-dev
* commit '56b592240073b1ab116c6e23a9c4c34ef5ad80d8': Add IAudioTrack::getTimestamp()
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
-rw-r--r--services/audioflinger/AudioFlinger.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index e5e4113..5df04f4 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -411,6 +411,7 @@ private:
virtual status_t setMediaTimeTransform(const LinearTransform& xform,
int target);
virtual status_t setParameters(const String8& keyValuePairs);
+ virtual status_t getTimestamp(AudioTimestamp& timestamp);
virtual status_t onTransact(
uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);