diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-07-29 21:13:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-29 21:13:14 +0000 |
| commit | 7f249fa9bcb64da324d19f551943fac7686d221c (patch) | |
| tree | 76cc14be9525f53fbf910c00884ebe4b5c9988c9 /services | |
| parent | ae4b5f93444802632d71ec34373842e6f5febbaa (diff) | |
| parent | fad226abd12435dbcd232f7de396f1a097b2bd5f (diff) | |
| download | frameworks_av-7f249fa9bcb64da324d19f551943fac7686d221c.zip frameworks_av-7f249fa9bcb64da324d19f551943fac7686d221c.tar.gz frameworks_av-7f249fa9bcb64da324d19f551943fac7686d221c.tar.bz2 | |
Merge "Use standard name and type for channel mask"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index e1b3854..1a513c4 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1469,7 +1469,7 @@ void AudioFlinger::PlaybackThread::audioConfigChanged_l(int event, int param) { switch (event) { case AudioSystem::OUTPUT_OPENED: case AudioSystem::OUTPUT_CONFIG_CHANGED: - desc.channels = mChannelMask; + desc.channelMask = mChannelMask; desc.samplingRate = mSampleRate; desc.format = mFormat; desc.frameCount = mNormalFrameCount; // FIXME see @@ -3225,7 +3225,7 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l() } } if (param.getInt(String8(AudioParameter::keyChannels), value) == NO_ERROR) { - if (value != AUDIO_CHANNEL_OUT_STEREO) { + if ((audio_channel_mask_t) value != AUDIO_CHANNEL_OUT_STEREO) { status = BAD_VALUE; } else { reconfig = true; @@ -4889,7 +4889,7 @@ void AudioFlinger::RecordThread::audioConfigChanged_l(int event, int param) { switch (event) { case AudioSystem::INPUT_OPENED: case AudioSystem::INPUT_CONFIG_CHANGED: - desc.channels = mChannelMask; + desc.channelMask = mChannelMask; desc.samplingRate = mSampleRate; desc.format = mFormat; desc.frameCount = mFrameCount; |