diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-26 12:01:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:01:50 +0000 |
| commit | be7bb9004c8663d145b998b6a6a349cb136dd6ae (patch) | |
| tree | aa3d8ed7f3446a79f32b9df51cedefa1eb752fe0 /include | |
| parent | a7ec5f1067d640be206bf597a67c64750b8a1fef (diff) | |
| parent | 47f52f247d6d895878b831de448f19b98225515d (diff) | |
| download | system_core-be7bb9004c8663d145b998b6a6a349cb136dd6ae.zip system_core-be7bb9004c8663d145b998b6a6a349cb136dd6ae.tar.gz system_core-be7bb9004c8663d145b998b6a6a349cb136dd6ae.tar.bz2 | |
am 47f52f24: audio: new stream types
* commit '47f52f247d6d895878b831de448f19b98225515d':
audio: new stream types
Diffstat (limited to 'include')
| -rw-r--r-- | include/system/audio.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index df454ff..2749ce0 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -57,10 +57,14 @@ typedef enum { * and must be routed to speaker */ AUDIO_STREAM_DTMF = 8, - AUDIO_STREAM_TTS = 9, - - AUDIO_STREAM_CNT, - AUDIO_STREAM_MAX = AUDIO_STREAM_CNT - 1, + AUDIO_STREAM_TTS = 9, /* Transmitted Through Speaker. + * Plays over speaker only, silent on other devices. + */ + AUDIO_STREAM_ACCESSIBILITY = 10, /* For accessibility talk back prompts */ + AUDIO_STREAM_REROUTING = 11, /* For dynamic policy output mixes */ + AUDIO_STREAM_PATCH = 12, /* For internal audio flinger tracks. Fixed volume */ + AUDIO_STREAM_PUBLIC_CNT = AUDIO_STREAM_TTS + 1, + AUDIO_STREAM_CNT = AUDIO_STREAM_PATCH + 1, } audio_stream_type_t; /* Do not change these values without updating their counterparts |