From 69ed2e4e7db7a9a111288ab211fe8384912b87ee Mon Sep 17 00:00:00 2001 From: Seonmi Jin Date: Thu, 30 Jul 2015 17:05:28 +0900 Subject: audio-hal: Remove unused code [Version] Release 0.2.7 [Profile] TV target(xu3) Change-Id: I530979d1dd8002e414e78b38de377e2ae3022114 Signed-off-by: Seonmi Jin --- packaging/audio-hal-max98090.spec | 2 +- tizen-audio-device.c | 19 +++++++++++-------- tizen-audio-volume.c | 10 +--------- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/packaging/audio-hal-max98090.spec b/packaging/audio-hal-max98090.spec index 11c669e..77bbfdc 100644 --- a/packaging/audio-hal-max98090.spec +++ b/packaging/audio-hal-max98090.spec @@ -1,6 +1,6 @@ Name: audio-hal-max98090 Summary: TIZEN Audio HAL for MAX98090 -Version: 0.2.6 +Version: 0.2.7 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/tizen-audio-device.c b/tizen-audio-device.c index c7b651e..2f39fc4 100644 --- a/tizen-audio-device.c +++ b/tizen-audio-device.c @@ -160,9 +160,11 @@ static audio_return_t _do_route_ap_playback_capture (audio_mgr_t *am, audio_rout { audio_return_t audio_ret = AUDIO_RET_OK; device_info_t *devices = route_info->device_infos; - int mod_idx = 0; const char *verb = NULL; - const char *modifiers[MAX_MODIFIERS] = {NULL,}; + + /* To Do: Set modifiers */ + /* int mod_idx = 0; */ + /* const char *modifiers[MAX_MODIFIERS] = {NULL,}; */ verb = AUDIO_USE_CASE_VERB_HIFI; AUDIO_LOG_INFO("do_route_ap_playback_capture++ "); @@ -175,7 +177,8 @@ static audio_return_t _do_route_ap_playback_capture (audio_mgr_t *am, audio_rout } am->device.mode = VERB_NORMAL; - /* FIXME. Set modifiers */ + /* To Do: Set modifiers */ + /* if (!strncmp("voice_recognition", route_info->role, MAX_NAME_LEN)) { modifiers[mod_idx++] = AUDIO_USE_CASE_MODIFIER_VOICESEARCH; } else if ((!strncmp("alarm", route_info->role, MAX_NAME_LEN))||(!strncmp("notifiication", route_info->role, MAX_NAME_LEN))) { @@ -190,6 +193,7 @@ static audio_return_t _do_route_ap_playback_capture (audio_mgr_t *am, audio_rout modifiers[mod_idx++] = AUDIO_USE_CASE_MODIFIER_MEDIA; } audio_ret = _audio_ucm_set_modifiers (am, verb, modifiers); + */ return audio_ret; } @@ -222,9 +226,10 @@ audio_return_t _do_route_voip (audio_mgr_t *am, device_info_t *devices, int32_t audio_return_t _do_route_reset (audio_mgr_t *am, uint32_t direction) { audio_return_t audio_ret = AUDIO_RET_OK; - const char *verb = NULL; - verb = AUDIO_USE_CASE_VERB_INACTIVE; + /* FIXME: If you need to reset, set verb inactive */ + /* const char *verb = NULL; */ + /* verb = AUDIO_USE_CASE_VERB_INACTIVE; */ AUDIO_LOG_INFO("do_route_reset++, direction(%p)", direction); AUDIO_RETURN_VAL_IF_FAIL(am, AUDIO_ERR_PARAMETER); @@ -273,7 +278,6 @@ audio_return_t audio_do_route (void *userdata, audio_route_info_t *info) audio_return_t audio_update_stream_connection_info (void *userdata, audio_stream_info_t *info, uint32_t is_connected) { audio_return_t audio_ret = AUDIO_RET_OK; - int i = 0; audio_mgr_t *am = (audio_mgr_t *)userdata; AUDIO_RETURN_VAL_IF_FAIL(am, AUDIO_ERR_PARAMETER); @@ -286,7 +290,6 @@ audio_return_t audio_update_stream_connection_info (void *userdata, audio_stream audio_return_t audio_update_route_option (void *userdata, audio_route_option_t *option) { audio_return_t audio_ret = AUDIO_RET_OK; - int i = 0; audio_mgr_t *am = (audio_mgr_t *)userdata; AUDIO_RETURN_VAL_IF_FAIL(am, AUDIO_ERR_PARAMETER); @@ -411,7 +414,7 @@ audio_return_t audio_pcm_avail(void *pcm_handle) n = snd_pcm_avail(pcm_handle); if (n <= 0) { - ret == snd_pcm_wait(pcm_handle, 10); + ret = snd_pcm_wait(pcm_handle, 10); if(ret == 0){ AUDIO_LOG_DEBUG("snd_pcm_wait = %d\n", ret); continue; diff --git a/tizen-audio-volume.c b/tizen-audio-volume.c index 96ea40a..e841f4a 100644 --- a/tizen-audio-volume.c +++ b/tizen-audio-volume.c @@ -47,14 +47,6 @@ static const char *g_volume_vconf[AUDIO_VOLUME_TYPE_MAX] = { "file/private/sound/volume/fixed", /* AUDIO_VOLUME_TYPE_FIXED */ }; -static const char *__get_device_string_by_idx (uint32_t dev_idx) -{ - switch (dev_idx) { - case AUDIO_VOLUME_DEVICE_DEFAULT: return "speaker"; - default: return "invalid"; - } -} - static const char *__get_volume_type_string_by_idx (uint32_t vol_type_idx) { switch (vol_type_idx) { @@ -116,7 +108,7 @@ static const char *__get_gain_type_string_by_idx (uint32_t gain_type_idx) static void __dump_tb (audio_mgr_t *am) { audio_volume_value_table_t *volume_value_table = am->volume.volume_value_table; - uint32_t dev_idx, vol_type_idx, vol_level_idx, gain_type_idx; + uint32_t vol_type_idx, vol_level_idx, gain_type_idx; const char *gain_type_str[] = { "def", /* AUDIO_GAIN_TYPE_DEFAULT */ "dial", /* AUDIO_GAIN_TYPE_DIALER */ -- cgit v1.2.3