From 42a48a7eef1328f49f4ded4261ae350a3753bd52 Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Tue, 14 Jun 2016 13:45:40 +0900 Subject: [PATCH] Fix wrong mapping issue for audio_state Change-Id: I507c11a773f0e4aa4618e0e1195a8622c247acde --- module/src/callmgr-audio.c | 2 +- packaging/call-manager.spec | 2 +- service/src/callmgr-core.c | 48 ++++++++++++++++++++++++++++++++------------- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/module/src/callmgr-audio.c b/module/src/callmgr-audio.c index a1ace1d..29be21a 100644 --- a/module/src/callmgr-audio.c +++ b/module/src/callmgr-audio.c @@ -140,7 +140,7 @@ static void __callmgr_audio_available_route_changed_cb(sound_device_h device, bo sound_device_type_e device_type = SOUND_DEVICE_BUILTIN_RECEIVER; sound_manager_get_device_type(device, &device_type); - info("Available route : %s (%d)", + info("Available route : %s (%s)", __callmgr_audio_convert_device_type_to_string(device_type), is_connected ? "Connected" : "Disconnected"); diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec index 8361142..a3667c5 100644 --- a/packaging/call-manager.spec +++ b/packaging/call-manager.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 66 +%define patchlevel 67 %define ext_feature 0 Name: call-manager diff --git a/service/src/callmgr-core.c b/service/src/callmgr-core.c index 25a408f..9ea3279 100644 --- a/service/src/callmgr-core.c +++ b/service/src/callmgr-core.c @@ -1661,19 +1661,19 @@ static void __callmgr_core_process_audio_events(cm_audio_event_type_e event_type cm_telephony_audio_path_type_e telephony_type = CM_TAPI_SOUND_PATH_HANDSET; _callmgr_core_get_audio_state(core_data, &route); - switch(route){ - case CALL_AUDIO_PATH_SPEAKER_E: - telephony_type = CM_TAPI_SOUND_PATH_SPK_PHONE; - break; - case CALL_AUDIO_PATH_EARJACK_E: - telephony_type = CM_TAPI_SOUND_PATH_HEADSET; - break; - case CALL_AUDIO_PATH_BT_E: - telephony_type = CM_TAPI_SOUND_PATH_BLUETOOTH; - break; - default: - telephony_type = CM_TAPI_SOUND_PATH_HANDSET; - break; + switch (route) { + case CALL_AUDIO_PATH_SPEAKER_E: + telephony_type = CM_TAPI_SOUND_PATH_SPK_PHONE; + break; + case CALL_AUDIO_PATH_EARJACK_E: + telephony_type = CM_TAPI_SOUND_PATH_HEADSET; + break; + case CALL_AUDIO_PATH_BT_E: + telephony_type = CM_TAPI_SOUND_PATH_BLUETOOTH; + break; + default: + telephony_type = CM_TAPI_SOUND_PATH_HANDSET; + break; } info("type : %d, vol : %d", telephony_type, volume); @@ -2155,7 +2155,27 @@ int _callmgr_core_get_audio_state(callmgr_core_data_t *core_data, callmgr_path_t return -1; } - *o_audio_state = audio_state; + switch (audio_state) { + case CALLMGR_AUDIO_ROUTE_NONE_E: + *o_audio_state = CALL_AUDIO_PATH_NONE_E; + break; + case CALLMGR_AUDIO_ROUTE_SPEAKER_E: + *o_audio_state = CALL_AUDIO_PATH_SPEAKER_E; + break; + case CALLMGR_AUDIO_ROUTE_RECEIVER_E: + *o_audio_state = CALL_AUDIO_PATH_RECEIVER_E; + break; + case CALLMGR_AUDIO_ROUTE_EARJACK_E: + *o_audio_state = CALL_AUDIO_PATH_EARJACK_E; + break; + case CALLMGR_AUDIO_ROUTE_BT_E: + *o_audio_state = CALL_AUDIO_PATH_BT_E; + break; + default: + err("Invalid audio state [%d]", audio_state); + *o_audio_state = CALL_AUDIO_PATH_NONE_E; + break; + } return 0; } -- 2.7.4