diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-01-17 10:23:01 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-25 17:29:00 -0700 |
| commit | 45faf7e02791993a487d6e038d16ff46395f1975 (patch) | |
| tree | d54ff27f6fd42e670ddebfa993a00b5202fb7633 | |
| parent | 1392eb3d1802e9f894f87d7a7387207d1b6faca1 (diff) | |
| download | frameworks_av-45faf7e02791993a487d6e038d16ff46395f1975.zip frameworks_av-45faf7e02791993a487d6e038d16ff46395f1975.tar.gz frameworks_av-45faf7e02791993a487d6e038d16ff46395f1975.tar.bz2 | |
Use symbol AUDIO_DEVICE_NONE from <system/audio.h>
Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58
| -rw-r--r-- | media/libmedia/AudioSystem.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp index 140fb66..dafccd6 100644 --- a/media/libmedia/AudioSystem.cpp +++ b/media/libmedia/AudioSystem.cpp @@ -739,7 +739,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 762681e..67564ee 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 ? diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 50179c5..29b51fb 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1561,7 +1561,7 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module, ALOGV("openOutput(), offloadInfo %p version 0x%04x", offloadInfo, offloadInfo == NULL ? -1 : offloadInfo->version); - if (pDevices == NULL || *pDevices == 0) { + if (pDevices == NULL || *pDevices == AUDIO_DEVICE_NONE) { return 0; } @@ -1775,7 +1775,7 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, audio_format_t reqFormat = config.format; audio_channel_mask_t reqChannelMask = config.channel_mask; - if (pDevices == NULL || *pDevices == 0) { + if (pDevices == NULL || *pDevices == AUDIO_DEVICE_NONE) { return 0; } |