audio-hal: Remove unused code

[Version] Release 0.2.7
[Profile] Mobile target(n4)

Change-Id: I2456dec1f97ed47f885b9fa8bd3021efc2f38970
Signed-off-by: Seonmi Jin <seonmi.jin@samsung.com>

diff --git a/packaging/audio-hal-wm5110.spec b/packaging/audio-hal-wm5110.spec
index 9e6094c0595787b0f9021701d3e356fdaf5900e9..38a4f817fe02f64490f51b11d272700eaa7e48a4 100644 (file)
--- a/packaging/audio-hal-wm5110.spec
+++ b/packaging/audio-hal-wm5110.spec
@@ -1,6 +1,6 @@
 Name:       audio-hal-wm5110
 Summary:    TIZEN Audio HAL for WM5110
-Version:    0.2.6
+Version:    0.2.7
 Release:    0
 VCS:        adaptation/samsung_exynos/audio-hal-wm5110#a568942051241d60e37c6738466a2a5058f260c0
 Group:      System/Libraries

diff --git a/tizen-audio-device.c b/tizen-audio-device.c
index 4db7c429f9a5b09690d4ad98781ce797d2179f2c..2409a8b192451b898305c30db7fb68e6fe104b41 100644 (file)
--- a/tizen-audio-device.c
+++ b/tizen-audio-device.c
@@ -163,9 +163,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++ ");
@@ -178,7 +180,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))) {
@@ -198,6 +201,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;
 }
@@ -250,9 +254,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);
@@ -308,7 +313,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);
@@ -321,7 +325,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);
@@ -549,7 +552,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-internal.h b/tizen-audio-internal.h
index 42fb3d4a05d5a30f34c3cfaec2d84406e0ec99b9..5634113b85c141c9523160ee3e0bf2c2300e438a 100644 (file)
--- a/tizen-audio-internal.h
+++ b/tizen-audio-internal.h
@@ -119,7 +119,7 @@ typedef struct device_type {
 
 #define ALSA_DEFAULT_CARD       "wm5110"
 #define VOICE_PCM_DEVICE        "hw:0,1"
-#define PLAYBACK_PCM_DEVICE     "hw:0,3"
+#define PLAYBACK_PCM_DEVICE     "hw:0,0"
 #define CAPTURE_PCM_DEVICE      "hw:0,0"
 
 #define PERIODSZ_PLAYBACK 2048

diff --git a/tizen-audio-volume.c b/tizen-audio-volume.c
index 96ea40a34119680fd97c78a23e1fd3da471e6aca..e841f4a3871cb4f23f5cc789c4b2a9a93325b2de 100644 (file)
--- 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 */