summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioFlinger.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-08-29 17:12:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-29 17:12:44 -0700
commitec9ad1b0947f5d6b465281312dbe92f096a8f881 (patch)
tree71a3b3f48c0c563311db4fedf75efa5241d2d2c9 /services/audioflinger/AudioFlinger.h
parent6dc365f0d5a92084517f0c3846e4f07fc7206bab (diff)
parentf94b2946a511c5cbb6b9001449ca8278cb332bda (diff)
downloadframeworks_av-ec9ad1b0947f5d6b465281312dbe92f096a8f881.zip
frameworks_av-ec9ad1b0947f5d6b465281312dbe92f096a8f881.tar.gz
frameworks_av-ec9ad1b0947f5d6b465281312dbe92f096a8f881.tar.bz2
am f94b2946: am 56b59224: Merge "Add IAudioTrack::getTimestamp()" into klp-dev
* commit 'f94b2946a511c5cbb6b9001449ca8278cb332bda': 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 50c20b8..1269aa4 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);