summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-03-23 16:05:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-23 16:05:19 +0000
commit5c242217a809e13a1704100fb991e03ce4985e6c (patch)
treec8bc3a7c49f687c2afed67329ef0d531bb1d6b3c /include
parente063c308aaeaf85c9c41fda5df083a8aa90bdb24 (diff)
parenta9757af8a140a1d5ae261c22f9d7eebef99cbe96 (diff)
downloadframeworks_av-5c242217a809e13a1704100fb991e03ce4985e6c.zip
frameworks_av-5c242217a809e13a1704100fb991e03ce4985e6c.tar.gz
frameworks_av-5c242217a809e13a1704100fb991e03ce4985e6c.tar.bz2
Merge "Move AudioTrack::isOffloaded() and isDirect() variants"
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioTrack.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index b5a3a9a..fd9200a 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -667,10 +667,6 @@ protected:
static const nsecs_t NS_WHENEVER = -1, NS_INACTIVE = -2, NS_NEVER = -3;
nsecs_t processAudioBuffer();
- bool isOffloaded() const;
- bool isDirect() const;
- bool isOffloadedOrDirect() const;
-
// caller must hold lock on mLock for all _l methods
status_t createTrack_l();
@@ -683,6 +679,10 @@ protected:
// FIXME enum is faster than strcmp() for parameter 'from'
status_t restoreTrack_l(const char *from);
+ bool isOffloaded() const;
+ bool isDirect() const;
+ bool isOffloadedOrDirect() const;
+
bool isOffloaded_l() const
{ return (mFlags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD) != 0; }