diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-22 02:27:49 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-23 01:10:44 +0000 |
| commit | f0bc5b54b71158924b613c7e568732d9c212e298 (patch) | |
| tree | abc5677954939f420a260265f744f5d2e2fb11b5 | |
| parent | 90b17dc3aca5efbed34a82972db73de71b724fe3 (diff) | |
| download | hardware_libhardware-f0bc5b54b71158924b613c7e568732d9c212e298.zip hardware_libhardware-f0bc5b54b71158924b613c7e568732d9c212e298.tar.gz hardware_libhardware-f0bc5b54b71158924b613c7e568732d9c212e298.tar.bz2 | |
Extend ICS_AUDIO_BLOB back-compat to the 4.2 API
Change-Id: Id58a2eb715c86f6c022e0ef625ce498661d7d29c
| -rw-r--r-- | include/hardware/audio.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/hardware/audio.h b/include/hardware/audio.h index 6e02157..acef499 100644 --- a/include/hardware/audio.h +++ b/include/hardware/audio.h @@ -56,7 +56,11 @@ __BEGIN_DECLS #define AUDIO_DEVICE_API_VERSION_0_0 HARDWARE_DEVICE_API_VERSION(0, 0) #define AUDIO_DEVICE_API_VERSION_1_0 HARDWARE_DEVICE_API_VERSION(1, 0) #define AUDIO_DEVICE_API_VERSION_2_0 HARDWARE_DEVICE_API_VERSION(2, 0) +#ifndef ICS_AUDIO_BLOB #define AUDIO_DEVICE_API_VERSION_CURRENT AUDIO_DEVICE_API_VERSION_2_0 +#else +#define AUDIO_DEVICE_API_VERSION_CURRENT AUDIO_DEVICE_API_VERSION_1_0 +#endif /** * List of known audio HAL modules. This is the base name of the audio HAL @@ -604,6 +608,7 @@ struct audio_hw_device { /** This method dumps the state of the audio hardware */ int (*dump)(const struct audio_hw_device *dev, int fd); +#ifndef ICS_AUDIO_BLOB /** * set the audio mute status for all audio activities. If any value other * than 0 is returned, the software mixer will emulate this capability. @@ -618,6 +623,7 @@ struct audio_hw_device { * method may leave it set to NULL. */ int (*get_master_mute)(struct audio_hw_device *dev, bool *mute); +#endif }; typedef struct audio_hw_device audio_hw_device_t; |