diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2011-11-03 02:33:56 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2011-11-03 02:33:56 +0000 |
| commit | 497e8031a48d0ed71835903b836a394ad017c2fc (patch) | |
| tree | 84d545693730841dd4dbf48879f0773f7b1b7fc2 /include | |
| parent | bc6073b01c6c4930acbeaa83306b8278cf89f917 (diff) | |
| download | frameworks_base-497e8031a48d0ed71835903b836a394ad017c2fc.zip frameworks_base-497e8031a48d0ed71835903b836a394ad017c2fc.tar.gz frameworks_base-497e8031a48d0ed71835903b836a394ad017c2fc.tar.bz2 | |
media: Make HAVE_FM_RADIO play nice with OMAP_ENHANCEMENT
OMAP_ENHANCEMENT devices can use CM's FM app (and stack)
without using HAVE_FM_RADIO, but the volume controls are lost.
If the target device's master volume affects FM, using
BOARD_HAVE_FM_RADIO is sufficient.
However, if a specific FM volume control is necessary,
HAVE_FM_RADIO needs to be used (and the volume functions
implemented in that device's HAL)
Change-Id: I00c46727a6f09cdd0cc11265a0a94a5a5aa63721
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 19f8cd6..034a185 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -293,7 +293,7 @@ public: DEVICE_OUT_WIRED_HEADPHONE | DEVICE_OUT_BLUETOOTH_SCO | DEVICE_OUT_BLUETOOTH_SCO_HEADSET | #endif DEVICE_OUT_BLUETOOTH_SCO_CARKIT | DEVICE_OUT_BLUETOOTH_A2DP | DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES | -#ifdef OMAP_ENHANCEMENT +#if defined(OMAP_ENHANCEMENT) && !defined(HAVE_FM_RADIO) DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER | DEVICE_OUT_AUX_DIGITAL | DEVICE_OUT_LOW_POWER | DEVICE_OUT_FM_TRANSMIT | DEVICE_OUT_DEFAULT), #else |