diff options
| author | Ethan Chen <intervigil@gmail.com> | 2012-06-24 00:32:32 -0700 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2012-07-03 16:45:37 -0700 |
| commit | 4e8775c42cb9e22b687e6f3a2d6b6c96d85852a2 (patch) | |
| tree | 38eaa90dd86e9d2b55be81e6e22b99d1e03c4e7f | |
| parent | e84159c187b10cd36abdf73038f63647f6cd8fca (diff) | |
| download | android_hardware_libhardware_legacy-ics-release.tar.gz android_hardware_libhardware_legacy-ics-release.tar.bz2 android_hardware_libhardware_legacy-ics-release.zip | |
libhardware_legacy: don't always include setFmVolumeics-releasecm-9.1.0
| -rw-r--r-- | audio/AudioPolicyCompatClient.cpp | 2 | ||||
| -rw-r--r-- | audio/AudioPolicyCompatClient.h | 2 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioHardwareInterface.h | 2 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioPolicyInterface.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/audio/AudioPolicyCompatClient.cpp b/audio/AudioPolicyCompatClient.cpp index f411207..ec7e621 100644 --- a/audio/AudioPolicyCompatClient.cpp +++ b/audio/AudioPolicyCompatClient.cpp @@ -140,7 +140,7 @@ status_t AudioPolicyCompatClient::setStreamVolume( volume, output, delayMs); } -#if defined(QCOM_HARDWARE) && !defined(USES_AUDIO_LEGACY) +#if defined(QCOM_HARDWARE) && defined(HAVE_FM_RADIO) && !defined(USES_AUDIO_LEGACY) status_t AudioPolicyCompatClient::setFmVolume(float volume, int delayMs) { diff --git a/audio/AudioPolicyCompatClient.h b/audio/AudioPolicyCompatClient.h index 0ebdfb7..96d5373 100644 --- a/audio/AudioPolicyCompatClient.h +++ b/audio/AudioPolicyCompatClient.h @@ -76,7 +76,7 @@ public: virtual status_t startTone(ToneGenerator::tone_type tone, AudioSystem::stream_type stream); virtual status_t stopTone(); virtual status_t setVoiceVolume(float volume, int delayMs = 0); -#if defined(QCOM_HARDWARE) && !defined(USES_AUDIO_LEGACY) +#if defined(QCOM_HARDWARE) && defined(HAVE_FM_RADIO) && !defined(USES_AUDIO_LEGACY) virtual status_t setFmVolume(float volume, int delayMs = 0); #endif diff --git a/include/hardware_legacy/AudioHardwareInterface.h b/include/hardware_legacy/AudioHardwareInterface.h index 098ad2f..8387405 100644 --- a/include/hardware_legacy/AudioHardwareInterface.h +++ b/include/hardware_legacy/AudioHardwareInterface.h @@ -202,7 +202,7 @@ public: /** set the audio volume of a voice call. Range is between 0.0 and 1.0 */ virtual status_t setVoiceVolume(float volume) = 0; -#if defined(QCOM_HARDWARE) && !defined(USES_AUDIO_LEGACY) +#if defined(QCOM_HARDWARE) && defined(HAVE_FM_RADIO) && !defined(USES_AUDIO_LEGACY) /** set the fm volume. Range is between 0.0 and 1.0 */ virtual status_t setFmVolume(float volume) { return 0; } #endif diff --git a/include/hardware_legacy/AudioPolicyInterface.h b/include/hardware_legacy/AudioPolicyInterface.h index cff7f2c..ba28ec2 100644 --- a/include/hardware_legacy/AudioPolicyInterface.h +++ b/include/hardware_legacy/AudioPolicyInterface.h @@ -254,7 +254,7 @@ public: audio_io_handle_t srcOutput, audio_io_handle_t dstOutput) = 0; -#if defined(QCOM_HARDWARE) && !defined(USES_AUDIO_LEGACY) +#if defined(QCOM_HARDWARE) && defined(HAVE_FM_RADIO) && !defined(USES_AUDIO_LEGACY) // set FM volume. virtual status_t setFmVolume(float volume, int delayMs = 0) { return 0; } #endif |