summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrik Ryd <patrik.ryd@stericsson.com>2012-03-28 10:17:31 +0200
committerMathieu J. Poirier <mathieu.poirier@linaro.org>2012-04-05 15:18:19 -0600
commit2fc70df08f2cede5fca51f9946867258be9e63bf (patch)
treeb06fecfbebf22623df1915e47cbe1dd2363e1cfb
parentfc18425fbdd2c2dc80e1a78ff9702b56847922f4 (diff)
downloadcore-linaro_android_4.0.3_snowball_mm.tar.gz
FM Radio: Add FM Radio support for ICSlinaro_android_4.0.3_snowball_mm
Add devices and sources needed by the FM radio framework. Change-Id: Ie3da48e05dabebc4b502792d6215ddc6bb9cd734 Signed-off-by: Patrik Ryd <patrik.ryd@stericsson.com> Committed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
-rw-r--r--include/system/audio.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/include/system/audio.h b/include/system/audio.h
index 52ba5e7b4..efc36fe91 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -51,6 +51,15 @@ typedef enum {
AUDIO_STREAM_MAX = AUDIO_STREAM_CNT - 1,
} audio_stream_type_t;
+typedef enum audio_input_clients {
+ AUDIO_INPUT_CLIENT_ID1 = 0x1,
+ AUDIO_INPUT_CLIENT_ID2 = 0x2,
+ AUDIO_INPUT_CLIENT_ID3 = 0x3,
+ AUDIO_INPUT_CLIENT_ID4 = 0x4,
+ AUDIO_INPUT_CLIENT_PLAYBACK = 0x80000000, // request client of playback type
+ AUDIO_INPUT_CLIENT_RECORD = 0x80000001 // request client of recording type
+} audio_input_clients;
+
/* Do not change these values without updating their counterparts
* in media/java/android/media/MediaRecorder.java!
*/
@@ -63,7 +72,7 @@ typedef enum {
AUDIO_SOURCE_CAMCORDER = 5,
AUDIO_SOURCE_VOICE_RECOGNITION = 6,
AUDIO_SOURCE_VOICE_COMMUNICATION = 7,
-
+ AUDIO_SOURCE_FM_RADIO_RX = 8,
AUDIO_SOURCE_CNT,
AUDIO_SOURCE_MAX = AUDIO_SOURCE_CNT - 1,
} audio_source_t;
@@ -288,6 +297,7 @@ typedef enum {
AUDIO_DEVICE_OUT_AUX_DIGITAL = 0x400,
AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET = 0x800,
AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET = 0x1000,
+ AUDIO_DEVICE_OUT_FM_TX = 0x2000,
AUDIO_DEVICE_OUT_DEFAULT = 0x8000,
AUDIO_DEVICE_OUT_ALL = (AUDIO_DEVICE_OUT_EARPIECE |
AUDIO_DEVICE_OUT_SPEAKER |
@@ -300,6 +310,7 @@ typedef enum {
AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES |
AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER |
AUDIO_DEVICE_OUT_AUX_DIGITAL |
+ AUDIO_DEVICE_OUT_FM_TX |
AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET |
AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET |
AUDIO_DEVICE_OUT_DEFAULT),
@@ -319,6 +330,7 @@ typedef enum {
AUDIO_DEVICE_IN_AUX_DIGITAL = 0x200000,
AUDIO_DEVICE_IN_VOICE_CALL = 0x400000,
AUDIO_DEVICE_IN_BACK_MIC = 0x800000,
+ AUDIO_DEVICE_IN_FM_RX = 0x1000000,
AUDIO_DEVICE_IN_DEFAULT = 0x80000000,
AUDIO_DEVICE_IN_ALL = (AUDIO_DEVICE_IN_COMMUNICATION |
@@ -329,6 +341,7 @@ typedef enum {
AUDIO_DEVICE_IN_AUX_DIGITAL |
AUDIO_DEVICE_IN_VOICE_CALL |
AUDIO_DEVICE_IN_BACK_MIC |
+ AUDIO_DEVICE_IN_FM_RX |
AUDIO_DEVICE_IN_DEFAULT),
AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,
} audio_devices_t;