commit fad226abd12435dbcd232f7de396f1a097b2bd5f
author Glenn Kasten <gkasten@google.com> Tue Jul 16 17:19:58 2013 -0700
committer Glenn Kasten <gkasten@google.com> Wed Jul 24 17:49:04 2013 -0700
tree 4e5214f8f5b142239a9583e79032b70330fa7c8e
parent 39a60318dcd78b2cb406d2c7dba57cbe9c99c3e7

Use standard name and type for channel mask

Former name 'channels' was ambiguous with respect to channel count.

Change-Id: I716f792d95a7e0c787d27514ad6e93dbcef8a415

include/media/AudioSystem.h

diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index e7b85c0..f9e625e 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -155,11 +155,11 @@
     class OutputDescriptor {
     public:
         OutputDescriptor()
-        : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channels(0), frameCount(0), latency(0)  {}
+        : samplingRate(0), format(AUDIO_FORMAT_DEFAULT), channelMask(0), frameCount(0), latency(0)  {}
 
         uint32_t samplingRate;
         int32_t format;
-        int32_t channels;
+        audio_channel_mask_t channelMask;
         size_t frameCount;
         uint32_t latency;
     };