commit ab334fd351ae5a0e18903da123d63e565b536874
author Glenn Kasten <gkasten@google.com> Wed Mar 14 12:56:06 2012 -0700
committer Glenn Kasten <gkasten@google.com> Thu Mar 15 13:15:27 2012 -0700
tree 9bcc5a6151326d9ca345f9dfac0d9d68d48e73b4
parent 3c5bbaee376d235404f267fbe1693d1960bfaaef

audio_channel_in/out_mask_from_count

and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count

Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234

media/libmedia/JetPlayer.cpp

diff --git a/media/libmedia/JetPlayer.cpp b/media/libmedia/JetPlayer.cpp
index 312a493..f1f62f7 100644
--- a/media/libmedia/JetPlayer.cpp
+++ b/media/libmedia/JetPlayer.cpp
@@ -92,7 +92,7 @@
     mAudioTrack->set(AUDIO_STREAM_MUSIC,  //TODO parametrize this
             pLibConfig->sampleRate,
             AUDIO_FORMAT_PCM_16_BIT,
-            (pLibConfig->numChannels == 2) ? AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO,
+            audio_channel_out_mask_from_count(pLibConfig->numChannels),
             mTrackBufferSize,
             AUDIO_POLICY_OUTPUT_FLAG_NONE);