diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-11-07 08:29:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-07 08:29:31 -0800 |
| commit | 891b11da870ad3f860c1d2610ef4d8836ed6c590 (patch) | |
| tree | e6b9b1be319590d43afc496a55d779724b3db10c /include | |
| parent | b2800e8f1360cbc3c5af2bea228b9622b1ddc9dd (diff) | |
| parent | c26741598a840f7c1d12ee457fb26f68fcdbcc70 (diff) | |
| download | frameworks_av-891b11da870ad3f860c1d2610ef4d8836ed6c590.zip frameworks_av-891b11da870ad3f860c1d2610ef4d8836ed6c590.tar.gz frameworks_av-891b11da870ad3f860c1d2610ef4d8836ed6c590.tar.bz2 | |
Merge "Remove CBLK_FAST from control block flags"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IAudioFlinger.h | 2 | ||||
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index 359780e..0aa48c6 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -62,7 +62,7 @@ public: audio_format_t format, audio_channel_mask_t channelMask, int frameCount, - track_flags_t flags, + track_flags_t *flags, const sp<IMemory>& sharedBuffer, audio_io_handle_t output, pid_t tid, // -1 means unused, otherwise must be valid non-0 diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 6a86a00..141078f 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -41,7 +41,6 @@ namespace android { #define CBLK_DISABLED 0x10 // track disabled by AudioFlinger due to underrun, need to re-start #define CBLK_RESTORING 0x20 // track is being restored after invalidation by AudioFlinger #define CBLK_RESTORED 0x40 // track has been restored after invalidation by AudioFlinger -#define CBLK_FAST 0x80 // AudioFlinger successfully created a fast track // Important: do not add any virtual methods, including ~ struct audio_track_cblk_t |