summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorST-Ericsson <void@stericsson.com>2011-12-09 10:44:06 +0530
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2012-04-05 15:20:03 -0600
commit9a7fe85702ed5cff3dbc7c8bfddbc896b138bbd5 (patch)
treecbe4ea4e5203b4a675c3eb90f123790610701b48
parent206499be2ae72b907b409233990698517ba70e4e (diff)
downloadlibhardware-linaro_android_4.0.3_snowball_mm.tar.gz
FM Radio: Add FM Radio support for ICSlinaro_android_4.0.3_snowball_mm
This patch adds an input parameter to set-up FM Radio as an input source which is required in Android Audio Flinger layer, to select between the playback and recording setups. Change-Id: I3c58b4ab438bd0b770112fa49a70010f31ced835 Signed-off-by: Patrik Ryd <patrik.ryd@stericsson.com> Committed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-rw-r--r--include/hardware/audio_policy.h8
-rw-r--r--modules/audio/audio_policy.c3
2 files changed, 7 insertions, 4 deletions
diff --git a/include/hardware/audio_policy.h b/include/hardware/audio_policy.h
index fc56e5ef..bbbe4c43 100644
--- a/include/hardware/audio_policy.h
+++ b/include/hardware/audio_policy.h
@@ -158,7 +158,8 @@ struct audio_policy {
uint32_t samplingRate,
uint32_t format,
uint32_t channels,
- audio_in_acoustics_t acoustics);
+ audio_in_acoustics_t acoustics,
+ audio_input_clients *inputClientId);
/* indicates to the audio policy manager that the input starts being used */
int (*start_input)(struct audio_policy *pol, audio_io_handle_t input);
@@ -279,10 +280,11 @@ struct audio_policy_service_ops {
uint32_t *pSamplingRate,
uint32_t *pFormat,
uint32_t *pChannels,
- uint32_t acoustics);
+ uint32_t acoustics,
+ uint32_t *pInputClientId);
/* closes an audio input */
- int (*close_input)(void *service, audio_io_handle_t input);
+ int (*close_input)(void *service, audio_io_handle_t input, uint32_t *inputClientId);
/* */
/* misc control functions */
diff --git a/modules/audio/audio_policy.c b/modules/audio/audio_policy.c
index 409f0a10..ade1b5da 100644
--- a/modules/audio/audio_policy.c
+++ b/modules/audio/audio_policy.c
@@ -124,7 +124,8 @@ static audio_io_handle_t ap_get_input(struct audio_policy *pol, int inputSource,
uint32_t sampling_rate,
uint32_t format,
uint32_t channels,
- audio_in_acoustics_t acoustics)
+ audio_in_acoustics_t acoustics,
+ audio_input_clients* pInputClientId)
{
return 0;
}