commit 72721a95943c68ea0d75eb5c1ff2ab7380e4dc6f
author Glenn Kasten <gkasten@google.com> Wed Mar 14 13:38:46 2012 -0700
committer Glenn Kasten <gkasten@google.com> Mon Jun 25 10:46:59 2012 -0700
tree 49badf525c97bcde7102f241a4c9c4213387b858
parent 3400c346f272492b52c7395c14d4a0f27603f87f

Use audio_channel_mask_t consistently

Change-Id: I77a624e2656046075eb38cf880c26cdf8ba36af8

src/android/android_sles_conversions.h

diff --git a/src/android/android_sles_conversions.h b/src/android/android_sles_conversions.h
index 6a27dc0..9f6aac4 100644
--- a/src/android/android_sles_conversions.h
+++ b/src/android/android_sles_conversions.h
@@ -62,13 +62,13 @@
 }
 
 
-static inline int sles_to_android_channelMaskIn(SLuint32 nbChannels, SLuint32 channelMask) {
+static inline audio_channel_mask_t sles_to_android_channelMaskIn(SLuint32 nbChannels, SLuint32 channelMask) {
     // FIXME handle channel mask mapping between SL ES and Android
     return audio_channel_in_mask_from_count(nbChannels);
 }
 
 
-static inline int sles_to_android_channelMaskOut(SLuint32 nbChannels, SLuint32 channelMask) {
+static inline audio_channel_mask_t sles_to_android_channelMaskOut(SLuint32 nbChannels, SLuint32 channelMask) {
     // FIXME handle channel mask mapping between SL ES and Android
     return audio_channel_out_mask_from_count(nbChannels);
 }