From 5d4a67e4163f7f83e49ae9e4a2c5927c15c39428 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Tue, 10 Jul 2018 16:44:17 +0900 Subject: [PATCH] Add MM_SOUND_DEVICE_TYPE_RAOP [Version] 0.12.28 [Issue Type] Feature Change-Id: I1533f03e174490ecf9ae4d64ef8c0d72c13617f4 --- include/mm_sound.h | 17 +++++++++-------- mm_sound_device.c | 2 ++ packaging/libmm-sound.spec | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/mm_sound.h b/include/mm_sound.h index a38345a..8fcdeec 100644 --- a/include/mm_sound.h +++ b/include/mm_sound.h @@ -759,7 +759,7 @@ typedef enum { typedef enum { MM_SOUND_DEVICE_IN_NONE = 0x00, - MM_SOUND_DEVICE_IN_MIC = 0x01, /**< Device builtin mic. */ + MM_SOUND_DEVICE_IN_MIC = 0x01, /**< Device builtin microphone */ MM_SOUND_DEVICE_IN_WIRED_ACCESSORY = 0x02, /**< Wired input devices */ MM_SOUND_DEVICE_IN_BT_SCO = 0x08, /**< Bluetooth SCO device */ } mm_sound_device_in; @@ -818,16 +818,17 @@ typedef enum { } mm_sound_device_state_e; typedef enum { - MM_SOUND_DEVICE_TYPE_BUILTIN_SPEAKER, /**< Built-in speaker. */ - MM_SOUND_DEVICE_TYPE_BUILTIN_RECEIVER, /**< Built-in receiver. */ - MM_SOUND_DEVICE_TYPE_BUILTIN_MIC, /**< Built-in mic. */ - MM_SOUND_DEVICE_TYPE_AUDIOJACK, /**< Audio jack such as headphone, headset, and so on. */ + MM_SOUND_DEVICE_TYPE_BUILTIN_SPEAKER, /**< Built-in speaker */ + MM_SOUND_DEVICE_TYPE_BUILTIN_RECEIVER, /**< Built-in receiver */ + MM_SOUND_DEVICE_TYPE_BUILTIN_MIC, /**< Built-in microphone */ + MM_SOUND_DEVICE_TYPE_AUDIOJACK, /**< Audio jack such as headphone, headset, and so on */ MM_SOUND_DEVICE_TYPE_BLUETOOTH, /**< Bluetooth */ MM_SOUND_DEVICE_TYPE_BLUETOOTH_A2DP = MM_SOUND_DEVICE_TYPE_BLUETOOTH, /**< Bluetooth A2DP */ - MM_SOUND_DEVICE_TYPE_HDMI, /**< HDMI. */ - MM_SOUND_DEVICE_TYPE_MIRRORING, /**< MIRRORING. */ - MM_SOUND_DEVICE_TYPE_USB_AUDIO, /**< USB Audio. */ + MM_SOUND_DEVICE_TYPE_HDMI, /**< HDMI */ + MM_SOUND_DEVICE_TYPE_MIRRORING, /**< MIRRORING */ + MM_SOUND_DEVICE_TYPE_USB_AUDIO, /**< USB Audio */ MM_SOUND_DEVICE_TYPE_BLUETOOTH_SCO, /**< Bluetooth SCO */ + MM_SOUND_DEVICE_TYPE_RAOP, /**< RAOP Audio */ } mm_sound_device_type_e; typedef void *MMSoundDevice_t; /**< MMsound Device handle */ diff --git a/mm_sound_device.c b/mm_sound_device.c index ee71480..55211fc 100644 --- a/mm_sound_device.c +++ b/mm_sound_device.c @@ -91,6 +91,8 @@ static int __convert_device_type_to_enum(char *device_type, mm_sound_device_type *device_type_enum = MM_SOUND_DEVICE_TYPE_MIRRORING; } else if (!strncmp(device_type, "usb-audio", VOLUME_TYPE_LEN)) { *device_type_enum = MM_SOUND_DEVICE_TYPE_USB_AUDIO; + } else if (!strncmp(device_type, "raop", VOLUME_TYPE_LEN)) { + *device_type_enum = MM_SOUND_DEVICE_TYPE_RAOP; } else { ret = MM_ERROR_INVALID_ARGUMENT; debug_error("not supported device_type(%s), err(0x%08x)", device_type, ret); diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec index dee1379..43d0c15 100644 --- a/packaging/libmm-sound.spec +++ b/packaging/libmm-sound.spec @@ -1,6 +1,6 @@ Name: libmm-sound Summary: MMSound Package contains client lib and sound_server binary -Version: 0.12.27 +Version: 0.12.28 Release: 0 Group: System/Libraries License: Apache-2.0 -- 2.7.4