summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/PlaybackTracks.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
commit30c296c153447f5c2bb5251928bf4d3c4e28e552 (patch)
treeadd654497b6e4ad0a66066a96ab1afd9e480327a /services/audioflinger/PlaybackTracks.h
parentec9ad1b0947f5d6b465281312dbe92f096a8f881 (diff)
parent3ae0a58a83d092d96672295c8a62908478f28a9b (diff)
downloadframeworks_av-30c296c153447f5c2bb5251928bf4d3c4e28e552.zip
frameworks_av-30c296c153447f5c2bb5251928bf4d3c4e28e552.tar.gz
frameworks_av-30c296c153447f5c2bb5251928bf4d3c4e28e552.tar.bz2
am 3ae0a58a: am 9841f636: Merge "Add AudioFlinger::PlaybackThread::Track::getTimestamp()" into klp-dev
* commit '3ae0a58a83d092d96672295c8a62908478f28a9b': Add AudioFlinger::PlaybackThread::Track::getTimestamp()
Diffstat (limited to 'services/audioflinger/PlaybackTracks.h')
-rw-r--r--services/audioflinger/PlaybackTracks.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/audioflinger/PlaybackTracks.h b/services/audioflinger/PlaybackTracks.h
index 43fb946..2f37dbb 100644
--- a/services/audioflinger/PlaybackTracks.h
+++ b/services/audioflinger/PlaybackTracks.h
@@ -60,6 +60,7 @@ public:
void setMainBuffer(int16_t *buffer) { mMainBuffer = buffer; }
int16_t *mainBuffer() const { return mMainBuffer; }
int auxEffectId() const { return mAuxEffectId; }
+ virtual status_t getTimestamp(AudioTimestamp& timestamp);
// implement FastMixerState::VolumeProvider interface
virtual uint32_t getVolumeLR();