diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-07-03 15:21:05 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-07-03 16:51:05 -0700 |
| commit | 16a7a0443a59c636ab20a3161ec630d037766ecc (patch) | |
| tree | 54737443b1247ff77764551b8e43d5fac1bc45d4 | |
| parent | 984410aebe0525e9fe3b80b94d06960094597b18 (diff) | |
| download | system_core-16a7a0443a59c636ab20a3161ec630d037766ecc.zip system_core-16a7a0443a59c636ab20a3161ec630d037766ecc.tar.gz system_core-16a7a0443a59c636ab20a3161ec630d037766ecc.tar.bz2 | |
Declare audio_devices_t as uint32_t & enum consts
Declare audio_devices_t as uint32_t to permit bit operations,
and a separate anonymous enum for the constants. This is similar to
audio_channel_mask_t.
Also remove spurious "typedef" on declaration of anonymous enum for
channel mask constants.
Change-Id: Ib4f92e9168261d44a475b3d48fe211e5c70ed441
| -rw-r--r-- | include/system/audio.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index 3807317..e6cd30b 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -152,7 +152,7 @@ typedef enum { AUDIO_FORMAT_PCM_SUB_8_24_BIT), } audio_format_t; -typedef enum { +enum { /* output channels */ AUDIO_CHANNEL_OUT_FRONT_LEFT = 0x1, AUDIO_CHANNEL_OUT_FRONT_RIGHT = 0x2, @@ -275,7 +275,7 @@ typedef enum { AUDIO_IN_ACOUSTICS_TX_DISABLE = 0, } audio_in_acoustics_t; -typedef enum { +enum { /* output devices */ AUDIO_DEVICE_OUT_EARPIECE = 0x1, AUDIO_DEVICE_OUT_SPEAKER = 0x2, @@ -339,7 +339,9 @@ typedef enum { AUDIO_DEVICE_IN_BACK_MIC | AUDIO_DEVICE_IN_DEFAULT), AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, -} audio_devices_t; +}; + +typedef uint32_t audio_devices_t; /* the audio output flags serve two purposes: * - when an AudioTrack is created they indicate a "wish" to be connected to an |