diff options
| author | Eric Laurent <elaurent@google.com> | 2015-07-06 21:48:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 21:48:32 +0000 |
| commit | 75bd29fde03953952804215d1f24d8dffaeda763 (patch) | |
| tree | add5332453c6b6ab2896f7e323a8e077964494da /services/audiopolicy/common | |
| parent | f60b6b6c776a762827874f6f635c0577359a7ee4 (diff) | |
| parent | b9d73333cce3f9da3a7a0b33589f6bbe0f992a92 (diff) | |
| download | frameworks_av-75bd29fde03953952804215d1f24d8dffaeda763.zip frameworks_av-75bd29fde03953952804215d1f24d8dffaeda763.tar.gz frameworks_av-75bd29fde03953952804215d1f24d8dffaeda763.tar.bz2 | |
Merge "audio: add definitions for devices connected over IP" into mnc-dev
Diffstat (limited to 'services/audiopolicy/common')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h index 036ce20..78d2cdf 100644 --- a/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h +++ b/services/audiopolicy/common/managerdefinitions/include/ConfigParsingUtils.h @@ -73,6 +73,7 @@ const StringToEnum sDeviceTypeToEnumTable[] = { STRING_TO_ENUM(AUDIO_DEVICE_OUT_SPDIF), STRING_TO_ENUM(AUDIO_DEVICE_OUT_FM), STRING_TO_ENUM(AUDIO_DEVICE_OUT_AUX_LINE), + STRING_TO_ENUM(AUDIO_DEVICE_OUT_IP), STRING_TO_ENUM(AUDIO_DEVICE_IN_AMBIENT), STRING_TO_ENUM(AUDIO_DEVICE_IN_BUILTIN_MIC), STRING_TO_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET), @@ -94,6 +95,7 @@ const StringToEnum sDeviceTypeToEnumTable[] = { STRING_TO_ENUM(AUDIO_DEVICE_IN_SPDIF), STRING_TO_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_A2DP), STRING_TO_ENUM(AUDIO_DEVICE_IN_LOOPBACK), + STRING_TO_ENUM(AUDIO_DEVICE_IN_IP), }; const StringToEnum sDeviceNameToEnumTable[] = { @@ -124,6 +126,7 @@ const StringToEnum sDeviceNameToEnumTable[] = { NAME_TO_ENUM("S/PDIF Out", AUDIO_DEVICE_OUT_SPDIF), NAME_TO_ENUM("FM transceiver Out", AUDIO_DEVICE_OUT_FM), NAME_TO_ENUM("Aux Line Out", AUDIO_DEVICE_OUT_AUX_LINE), + NAME_TO_ENUM("IP Out", AUDIO_DEVICE_OUT_IP), NAME_TO_ENUM("Ambient Mic", AUDIO_DEVICE_IN_AMBIENT), NAME_TO_ENUM("Built-In Mic", AUDIO_DEVICE_IN_BUILTIN_MIC), NAME_TO_ENUM("BT SCO Headset Mic", AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET), @@ -145,6 +148,7 @@ const StringToEnum sDeviceNameToEnumTable[] = { NAME_TO_ENUM("S/PDIF In", AUDIO_DEVICE_IN_SPDIF), NAME_TO_ENUM("BT A2DP In", AUDIO_DEVICE_IN_BLUETOOTH_A2DP), NAME_TO_ENUM("Loopback In", AUDIO_DEVICE_IN_LOOPBACK), + NAME_TO_ENUM("IP In", AUDIO_DEVICE_IN_IP), }; const StringToEnum sOutputFlagNameToEnumTable[] = { |