diff options
| author | Patrik Ryd <patrik.ryd@linaro.org> | 2012-06-13 16:17:20 +0200 |
|---|---|---|
| committer | Patrik Ryd <patrik.ryd@linaro.org> | 2012-06-18 10:18:19 +0200 |
| commit | f4eb561d962271921cd1ae2df510d19ef399f3cb (patch) | |
| tree | 48ff38dd3539754787043dc943f56b718c2de07c | |
| parent | 914b2d11f6cb5dd7fe9cfa795c86bc5dede18c21 (diff) | |
| download | libhardware-linaro_android_4.0.4_snowball_mm.tar.gz | |
Add #ifdef STERICSSON_CODEC_SUPPORT for ST-Ericsson modifications.linaro_android_4.0.4_snowball_mm
The snowball specific changes from ST-Ericsson are surrounded by
the STERICSSON_CODEC_SUPPORT flag.
Change-Id: I8f56d8f09894a6b8cea54e061ddbd31a638c7c1c
Signed-off-by: Patrik Ryd <patrik.ryd@linaro.org>
| -rw-r--r-- | include/hardware/audio_policy.h | 12 | ||||
| -rw-r--r-- | modules/audio/audio_policy.c | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h index bbbe4c43..c6cf7182 100644 --- a/include/hardware/audio_policy.h +++ b/include/hardware/audio_policy.h @@ -158,8 +158,12 @@ struct audio_policy { uint32_t samplingRate, uint32_t format, uint32_t channels, +#ifdef STERICSSON_CODEC_SUPPORT audio_in_acoustics_t acoustics, audio_input_clients *inputClientId); +#else + audio_in_acoustics_t acoustics); +#endif /* indicates to the audio policy manager that the input starts being used */ int (*start_input)(struct audio_policy *pol, audio_io_handle_t input); @@ -280,11 +284,19 @@ struct audio_policy_service_ops { uint32_t *pSamplingRate, uint32_t *pFormat, uint32_t *pChannels, +#ifdef STERICSSON_CODEC_SUPPORT uint32_t acoustics, uint32_t *pInputClientId); +#else + uint32_t acoustics); +#endif /* closes an audio input */ +#ifdef STERICSSON_CODEC_SUPPORT int (*close_input)(void *service, audio_io_handle_t input, uint32_t *inputClientId); +#else + int (*close_input)(void *service, audio_io_handle_t input); +#endif /* */ /* misc control functions */ diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c index ade1b5da..5b807681 100644 --- a/modules/audio/audio_policy.c +++ b/modules/audio/audio_policy.c @@ -124,8 +124,12 @@ static audio_io_handle_t ap_get_input(struct audio_policy *pol, int inputSource, uint32_t sampling_rate, uint32_t format, uint32_t channels, +#ifdef STERICSSON_CODEC_SUPPORT audio_in_acoustics_t acoustics, audio_input_clients* pInputClientId) +#else + audio_in_acoustics_t acoustics) +#endif { return 0; } |