From fad226abd12435dbcd232f7de396f1a097b2bd5f Mon Sep 17 00:00:00 2001
From: Glenn Kasten <gkasten@google.com>
Date: Tue, 16 Jul 2013 17:19:58 -0700
Subject: 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

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 @@ public:
     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;
     };
-- 
cgit v1.1