Disable ucm feature, and fix bug

[Version] 0.1.1
[Profile] Tv
[Issue Type] Remove Feature

Change-Id: Iaa86bf3eaa67bc79545bfc0c5d64f07a1a5cb71e

diff --git a/packaging/audio-hal-hawkp.spec b/packaging/audio-hal-hawkp.spec
index 05effa6..40115a3 100644 (file)
--- a/packaging/audio-hal-hawkp.spec
+++ b/packaging/audio-hal-hawkp.spec
@@ -1,6 +1,6 @@
 Name:       audio-hal-hawkp
 Summary:    TIZEN Audio HAL for Hawkp
-Version:    0.2.12
+Version:    0.1.1
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/tizen-audio-device.c b/tizen-audio-device.c
index 8a522d7..6a14c65 100644 (file)
--- a/tizen-audio-device.c
+++ b/tizen-audio-device.c
@@ -129,11 +129,14 @@ static audio_return_t set_devices(audio_hal_t *ah, const char *verb, device_info
         return AUDIO_ERR_PARAMETER;
     }
 
+#ifdef USE_UCM
     audio_ret = _audio_ucm_set_devices(ah, verb, active_devices);
     if (audio_ret) {
         AUDIO_LOG_ERROR("Failed to set device: error = %d", audio_ret);
         return audio_ret;
     }
+#endif
+
     return audio_ret;
 
 }
@@ -267,6 +270,8 @@ audio_return_t audio_do_route(void *audio_handle, audio_route_info_t *info)
 
     AUDIO_LOG_INFO("role:%s", info->role);
 
+    devices = info->device_infos;
+
     if (!strncmp("voip", info->role, MAX_NAME_LEN)) {
         audio_ret = _do_route_voip(ah, devices, info->num_of_devices);
         if (AUDIO_IS_ERROR(audio_ret)) {

diff --git a/tizen-audio-internal.h b/tizen-audio-internal.h
index 44eb00b..3ee5101 100644 (file)
--- a/tizen-audio-internal.h
+++ b/tizen-audio-internal.h
@@ -301,6 +301,8 @@ audio_return_t _audio_volume_deinit(audio_hal_t *ah);
 audio_return_t _audio_device_init(audio_hal_t *ah);
 audio_return_t _audio_device_deinit(audio_hal_t * ah);
 audio_return_t _audio_ucm_init(audio_hal_t *ah);
+
+#ifdef USE_UCM
 audio_return_t _audio_ucm_deinit(audio_hal_t *ah);
 void _audio_ucm_get_device_name(audio_hal_t *ah, const char *use_case, audio_direction_t direction, const char **value);
 #define _audio_ucm_update_use_case _audio_ucm_set_use_case
@@ -310,6 +312,8 @@ audio_return_t _audio_ucm_set_modifiers(audio_hal_t *ah, const char *verb, const
 int _audio_ucm_fill_device_info_list(audio_hal_t *ah, audio_device_info_t *device_info_list, const char *verb);
 audio_return_t _audio_ucm_get_verb(audio_hal_t *ah, const char **value);
 audio_return_t _audio_ucm_reset_use_case(audio_hal_t *ah);
+#endif
+
 audio_return_t _audio_util_init(audio_hal_t *ah);
 audio_return_t _audio_util_deinit(audio_hal_t *ah);
 audio_return_t _audio_mixer_control_set_param(audio_hal_t *ah, const char* ctl_name, snd_ctl_elem_value_t* value, int size);

diff --git a/tizen-audio.c b/tizen-audio.c
index cad4284..332dcb9 100644 (file)
--- a/tizen-audio.c
+++ b/tizen-audio.c
@@ -48,10 +48,12 @@ audio_return_t audio_init (void **audio_handle)
         AUDIO_LOG_ERROR("stream init failed");
         goto error_exit;
     }
+#ifdef USE_UCM
     if (AUDIO_IS_ERROR((ret = _audio_ucm_init(ah)))) {
         AUDIO_LOG_ERROR("ucm init failed");
         goto error_exit;
     }
+#endif
     if (AUDIO_IS_ERROR((ret = _audio_util_init(ah)))) {
         AUDIO_LOG_ERROR("mixer init failed");
         goto error_exit;