summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-07-09 15:39:54 -0700
committerGlenn Kasten <gkasten@google.com>2012-07-09 15:39:54 -0700
commit94479fd5405642c67efd14cebe722feb9cbe6e77 (patch)
treec316a649b478f44addc797a8d41cbcc370933397 /services
parent01542f2704f39956da09ae2840e192dab760091f (diff)
downloadframeworks_av-94479fd5405642c67efd14cebe722feb9cbe6e77.zip
frameworks_av-94479fd5405642c67efd14cebe722feb9cbe6e77.tar.gz
frameworks_av-94479fd5405642c67efd14cebe722feb9cbe6e77.tar.bz2
Fix build
Revert after system/core audio_devices_t is submitted Change-Id: I5a8ee1a7b711e834501e927f41c62efa6a6600b6
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/AudioFlinger.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index d25ccfc..ceaf27d 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1127,7 +1127,7 @@ AudioFlinger::ThreadBase::ThreadBase(const sp<AudioFlinger>& audioFlinger, audio
mChannelCount(0),
mFrameSize(1), mFormat(AUDIO_FORMAT_INVALID),
mParamStatus(NO_ERROR),
- mStandby(false), mDevice(device), mId(id),
+ mStandby(false), mDevice((audio_devices_t) device), mId(id),
mDeathRecipient(new PMDeathRecipient(this))
{
}
@@ -3447,7 +3447,7 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l()
// forward device change to effects that have requested to be
// aware of attached audio device.
- mDevice = value;
+ mDevice = (audio_devices_t) value;
for (size_t i = 0; i < mEffectChains.size(); i++) {
mEffectChains[i]->setDevice_l(mDevice);
}
@@ -6474,7 +6474,7 @@ bool AudioFlinger::RecordThread::checkForNewParameters_l()
// store input device and output device but do not forward output device to audio HAL.
// Note that status is ignored by the caller for output device
// (see AudioFlinger::setParameters()
- audio_devices_t newDevice = mDevice;
+ uint32_t /*audio_devices_t*/ newDevice = mDevice;
if (value & AUDIO_DEVICE_OUT_ALL) {
newDevice &= (uint32_t)~(value & AUDIO_DEVICE_OUT_ALL);
status = BAD_VALUE;
@@ -6489,7 +6489,7 @@ bool AudioFlinger::RecordThread::checkForNewParameters_l()
}
}
newDevice |= value;
- mDevice = newDevice; // since mDevice is read by other threads, only write to it once
+ mDevice = (audio_devices_t) newDevice; // since mDevice is read by other threads, only write to it once
}
if (status == NO_ERROR) {
status = mInput->stream->common.set_parameters(&mInput->stream->common, keyValuePair.string());