diff options
| author | tbalden <illespal@gmail.com> | 2012-06-14 17:11:09 -0700 |
|---|---|---|
| committer | Giulio Cervera <giulio.cervera@gmail.com> | 2012-07-03 23:28:00 +0200 |
| commit | 9f5abfdb19be0d2b8e1b47d6368568e7970db8cc (patch) | |
| tree | d4df30224e2c4e2833a790353acccf782144e2fc | |
| parent | 54afca028927a9a62932bf256de1dd5b86081c45 (diff) | |
| download | android_hardware_libhardware-ics-release.tar.gz android_hardware_libhardware-ics-release.tar.bz2 android_hardware_libhardware-ics-release.zip | |
libhardware: audio: make FM audio dependent on !USES_AUDIO_LEGACYics-releasecm-9.1.0
The libhardware_legacy implementation depends on !USES_AUDIO_LEGACY,
this should probably depend on it as well.
Change-Id: I618f7a0360c150876766323d4feb95ababbda0b3
| -rw-r--r-- | include/hardware/audio.h | 2 | ||||
| -rw-r--r-- | include/hardware/audio_policy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/hardware/audio.h b/include/hardware/audio.h index 19c7d44a..f8c3da8f 100644 --- a/include/hardware/audio.h +++ b/include/hardware/audio.h @@ -283,7 +283,7 @@ struct audio_hw_device { */ int (*set_master_volume)(struct audio_hw_device *dev, float volume); -#if defined(QCOM_HARDWARE) && defined(HAVE_FM_RADIO) +#if defined(QCOM_HARDWARE) && defined(HAVE_FM_RADIO) && !defined(USES_LEGACY_AUDIO) /** set the fm audio volume. Range is between 0.0 and 1.0 */ int (*set_fm_volume)(struct audio_hw_device *dev, float volume); #endif diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h index 8f62880d..8f209e34 100644 --- a/include/hardware/audio_policy.h +++ b/include/hardware/audio_policy.h @@ -378,7 +378,7 @@ struct audio_policy_service_ops { audio_io_handle_t src_output, audio_io_handle_t dst_output); -#ifdef QCOM_HARDWARE +#if defined(QCOM_HARDWARE) && defined(HAVE_FM_RADIO) && !defined(USES_LEGACY_AUDIO) /* set fm audio volume. */ int (*set_fm_volume)(void *service, float volume, |