diff options
author | Glenn Kasten <gkasten@google.com> | 2014-03-26 21:14:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 21:14:17 +0000 |
commit | 51beebba9d4989d05831a13bbe5cdf53ecac1bf5 (patch) | |
tree | b2c6af1099ba3c20b8dd08d39f8dcf822303971a /media | |
parent | b8f8d231685afdec472136b45c527a71bfb8bcc4 (diff) | |
parent | 45faf7e02791993a487d6e038d16ff46395f1975 (diff) | |
download | frameworks_av-51beebba9d4989d05831a13bbe5cdf53ecac1bf5.zip frameworks_av-51beebba9d4989d05831a13bbe5cdf53ecac1bf5.tar.gz frameworks_av-51beebba9d4989d05831a13bbe5cdf53ecac1bf5.tar.bz2 |
Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/AudioSystem.cpp | 2 | ||||
-rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 243ea40..8542404 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -730,7 +730,7 @@ uint32_t AudioSystem::getStrategyForStream(audio_stream_type_t stream) audio_devices_t AudioSystem::getDevicesForStream(audio_stream_type_t stream) { const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service(); - if (aps == 0) return (audio_devices_t)0; + if (aps == 0) return AUDIO_DEVICE_NONE; return aps->getDevicesForStream(stream); } diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index f28b82d..2cb0c5c 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -410,7 +410,7 @@ public: const audio_offload_info_t *offloadInfo) { Parcel data, reply; - audio_devices_t devices = pDevices != NULL ? *pDevices : (audio_devices_t)0; + audio_devices_t devices = pDevices != NULL ? *pDevices : AUDIO_DEVICE_NONE; uint32_t samplingRate = pSamplingRate != NULL ? *pSamplingRate : 0; audio_format_t format = pFormat != NULL ? *pFormat : AUDIO_FORMAT_DEFAULT; audio_channel_mask_t channelMask = pChannelMask != NULL ? @@ -501,7 +501,7 @@ public: audio_channel_mask_t *pChannelMask) { Parcel data, reply; - audio_devices_t devices = pDevices != NULL ? *pDevices : (audio_devices_t)0; + audio_devices_t devices = pDevices != NULL ? *pDevices : AUDIO_DEVICE_NONE; uint32_t samplingRate = pSamplingRate != NULL ? *pSamplingRate : 0; audio_format_t format = pFormat != NULL ? *pFormat : AUDIO_FORMAT_DEFAULT; audio_channel_mask_t channelMask = pChannelMask != NULL ? |