From a47f3165f53c8e8fb8907a94de7417e2c3047eeb Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Wed, 7 Nov 2012 10:13:08 -0800 Subject: Simplify AudioTrack::restoreTrack_l() Remove CBLK_RESTORING and CBLK_RESTORED from control block flags, for AudioTrack only. They are still used by AudioRecord. This is part of a series to clean up the control block. Change-Id: Iae4798f5b527c492bdaf789987ff3a1dadd0cb37 --- include/private/media/AudioTrackShared.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/private/media') diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 46788c4..90301cd 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -31,6 +31,7 @@ namespace android { // init time #define MAX_RUN_TIMEOUT_MS 1000 #define WAIT_PERIOD_MS 10 +// AudioTrack no longer uses this, it is for AudioRecord only: #define RESTORE_TIMEOUT_MS 5000 // Maximum waiting time for a track to be restored #define CBLK_UNDERRUN 0x01 // set: underrun (out) or overrrun (in), clear: no underrun or overrun @@ -38,6 +39,7 @@ namespace android { // clear: track is ready when buffer full #define CBLK_INVALID 0x04 // track buffer invalidated by AudioFlinger, need to re-create #define CBLK_DISABLED 0x08 // track disabled by AudioFlinger due to underrun, need to re-start +// AudioTrack no longer uses these, they are for AudioRecord only: #define CBLK_RESTORING 0x10 // track is being restored after invalidation by AudioFlinger #define CBLK_RESTORED 0x20 // track has been restored after invalidation by AudioFlinger -- cgit v1.1