diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-24 15:49:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-24 15:49:13 +0000 |
| commit | 87bc464a9f62f026fd841d3b54cfb1a5d57d83a3 (patch) | |
| tree | 5bdbb5886872c74b194f55be645d0b88e5d8d420 /include/system | |
| parent | 000b1d0c5058d9da4dfec3a6f16b58fd50c34374 (diff) | |
| parent | f7326dc0aa2da2df6bf1fa1ae7ef259a0ebdbd7b (diff) | |
| download | system_core-87bc464a9f62f026fd841d3b54cfb1a5d57d83a3.zip system_core-87bc464a9f62f026fd841d3b54cfb1a5d57d83a3.tar.gz system_core-87bc464a9f62f026fd841d3b54cfb1a5d57d83a3.tar.bz2 | |
Merge "Valid channel mask must have at least one channel"
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/audio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index c49b0ee..6c260dd 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -477,18 +477,18 @@ static inline bool audio_is_remote_submix_device(audio_devices_t device) return false; } -static inline bool audio_is_input_channel(uint32_t channel) +static inline bool audio_is_input_channel(audio_channel_mask_t channel) { if ((channel & ~AUDIO_CHANNEL_IN_ALL) == 0) - return true; + return channel != 0; else return false; } -static inline bool audio_is_output_channel(uint32_t channel) +static inline bool audio_is_output_channel(audio_channel_mask_t channel) { if ((channel & ~AUDIO_CHANNEL_OUT_ALL) == 0) - return true; + return channel != 0; else return false; } |