remove unnecessary feature : comm,lookback,voice...

Change-Id: Id3f5b5aa4f4bd39b88f0a273c2c4e87cbbdc59c1

diff --git a/Makefile.am b/Makefile.am
index b5c6943..1145f10 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ libtizen_audio_la_SOURCES = tizen-audio.c \
                tizen-audio-device.c \
                tizen-audio-volume.c \
                tizen-audio-ucm.c \
-               tizen-audio-comm.c \
                tizen-audio-util.c
 libtizen_audio_la_LDFLAGS = $(AM_LDFLAGS) -disable-static -avoid-version
 if USE_TINYALSA

diff --git a/tizen-audio-device.c b/tizen-audio-device.c
index e9c4d11..b8ea56b 100644 (file)
--- a/tizen-audio-device.c
+++ b/tizen-audio-device.c
@@ -290,8 +290,6 @@ static audio_return_t _do_route_reset(audio_hal_t *ah, uint32_t direction)
     return audio_ret;
 }
 
-#define LOOPBACK_ARG_LATENCY_MSEC      40
-#define LOOPBACK_ARG_ADJUST_TIME_SEC   3
 audio_return_t audio_do_route(void *audio_handle, audio_route_info_t *info)
 {
     audio_return_t audio_ret = AUDIO_RET_OK;
@@ -316,11 +314,6 @@ audio_return_t audio_do_route(void *audio_handle, audio_route_info_t *info)
             AUDIO_LOG_WARN("set reset return 0x%x", audio_ret);
         }
     } else {
-        /* send latency and adjust time for loopback */
-        if (!strncmp("loopback", info->role, MAX_NAME_LEN)) {
-            _audio_comm_send_message(ah, "loopback::latency", LOOPBACK_ARG_LATENCY_MSEC);
-            _audio_comm_send_message(ah, "loopback::adjust_time", LOOPBACK_ARG_ADJUST_TIME_SEC);
-        }
         /* need to prepare for "alarm","notification","emergency","voice-information","voice-recognition","ringtone" */
         audio_ret = _do_route_ap_playback_capture(ah, info);
         if (AUDIO_IS_ERROR(audio_ret)) {

diff --git a/tizen-audio-internal.h b/tizen-audio-internal.h
index 51f411c..30670fd 100644 (file)
--- a/tizen-audio-internal.h
+++ b/tizen-audio-internal.h
@@ -271,18 +271,12 @@ typedef enum audio_sample_format {
     AUDIO_SAMPLE_INVALID = -1
 } audio_sample_format_t;
 
-typedef struct audio_hal_comm {
-    message_cb msg_cb;
-    void *user_data;
-} audio_hal_comm_t;
-
 /* Overall */
 typedef struct audio_hal {
     audio_hal_device_t device;
     audio_hal_volume_t volume;
     audio_hal_ucm_t ucm;
     audio_hal_mixer_t mixer;
-    audio_hal_comm_t comm;
 } audio_hal_t;
 
 typedef struct {
@@ -304,9 +298,6 @@ audio_return_t _audio_ucm_init(audio_hal_t *ah);
 audio_return_t _audio_ucm_deinit(audio_hal_t *ah);
 audio_return_t _audio_util_init(audio_hal_t *ah);
 audio_return_t _audio_util_deinit(audio_hal_t *ah);
-audio_return_t _audio_comm_init(audio_hal_t *ah);
-audio_return_t _audio_comm_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
 audio_return_t _audio_ucm_set_use_case(audio_hal_t *ah, const char *verb, const char *devices[], const char *modifiers[]);
@@ -320,9 +311,6 @@ audio_return_t _audio_mixer_control_set_value(audio_hal_t *ah, const char *ctl_n
 audio_return_t _audio_mixer_control_set_value_string(audio_hal_t *ah, const char* ctl_name, const char* value);
 audio_return_t _audio_mixer_control_get_value(audio_hal_t *ah, const char *ctl_name, int *val);
 audio_return_t _audio_mixer_control_get_element(audio_hal_t *ah, const char *ctl_name, snd_hctl_elem_t **elem);
-audio_return_t _audio_comm_send_message(audio_hal_t *ah, const char *name, int value);
-audio_return_t _audio_comm_set_message_callback(audio_hal_t *ah, message_cb callback, void *user_data);
-audio_return_t _audio_comm_unset_message_callback(audio_hal_t *ah);
 audio_return_t _audio_pcm_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min, uint8_t period_event);
 audio_return_t _audio_pcm_set_hw_params(snd_pcm_t *pcm, audio_pcm_sample_spec_t *sample_spec, uint8_t *use_mmap, snd_pcm_uframes_t *period_size, snd_pcm_uframes_t *buffer_size);
 uint32_t _convert_format(audio_sample_format_t format);

diff --git a/tizen-audio.c b/tizen-audio.c
index d8f7a70..882a9b4 100644 (file)
--- a/tizen-audio.c
+++ b/tizen-audio.c
@@ -29,18 +29,6 @@ static const char* AUDIO_LATENCY_MID  = "mid";
 static const char* AUDIO_LATENCY_HIGH = "high";
 static const char* AUDIO_LATENCY_VOIP = "voip";
 
-audio_return_t audio_set_message_cb(void *audio_handle, message_cb callback, void *user_data)
-{
-    audio_return_t ret = AUDIO_RET_OK;
-
-    AUDIO_RETURN_VAL_IF_FAIL(audio_handle, AUDIO_ERR_PARAMETER);
-    AUDIO_RETURN_VAL_IF_FAIL(callback, AUDIO_ERR_PARAMETER);
-
-    ret = _audio_comm_set_message_callback((audio_hal_t *)audio_handle, callback, user_data);
-
-    return ret;
-}
-
 audio_return_t audio_init(void **audio_handle)
 {
     audio_hal_t *ah;
@@ -68,10 +56,6 @@ audio_return_t audio_init(void **audio_handle)
         AUDIO_LOG_ERROR("mixer init failed");
         goto error_exit;
     }
-    if (AUDIO_IS_ERROR((ret = _audio_comm_init(ah)))) {
-        AUDIO_LOG_ERROR("comm init failed");
-        goto error_exit;
-    }
 
     *audio_handle = (void *)ah;
     return AUDIO_RET_OK;
@@ -93,7 +77,6 @@ audio_return_t audio_deinit(void *audio_handle)
     _audio_volume_deinit(ah);
     _audio_ucm_deinit(ah);
     _audio_util_deinit(ah);
-    _audio_comm_deinit(ah);
     free(ah);
     ah = NULL;
 

diff --git a/tizen-audio.h b/tizen-audio.h
index 794cdd7..dcc95da 100644 (file)
--- a/tizen-audio.h
+++ b/tizen-audio.h
@@ -71,8 +71,6 @@ typedef struct audio_stream_info {
     uint32_t idx;
 } audio_stream_info_t ;
 
-typedef void (*message_cb)(const char *name, int value, void *user_data);
-
 /* Overall */
 typedef struct audio_interface {
     audio_return_t (*init)(void **audio_handle);
@@ -103,8 +101,6 @@ typedef struct audio_interface {
     audio_return_t (*pcm_recover)(void *audio_handle, void *pcm_handle, int revents);
     audio_return_t (*pcm_get_params)(void *audio_handle, void *pcm_handle, uint32_t direction, void **sample_spec, uint32_t *period_size, uint32_t *periods);
     audio_return_t (*pcm_set_params)(void *audio_handle, void *pcm_handle, uint32_t direction, void *sample_spec, uint32_t period_size, uint32_t periods);
-    /* Message callback */
-    audio_return_t (*set_message_cb)(void *audio_handle, message_cb callback, void *user_data);
 } audio_interface_t;
 
 audio_return_t audio_init(void **audio_handle);
@@ -131,5 +127,4 @@ audio_return_t audio_pcm_get_fd(void *audio_handle, void *pcm_handle, int *fd);
 audio_return_t audio_pcm_recover(void *audio_handle, void *pcm_handle, int revents);
 audio_return_t audio_pcm_get_params(void *audio_handle, void *pcm_handle, uint32_t direction, void **sample_spec, uint32_t *period_size, uint32_t *periods);
 audio_return_t audio_pcm_set_params(void *audio_handle, void *pcm_handle, uint32_t direction, void *sample_spec, uint32_t period_size, uint32_t periods);
-audio_return_t audio_set_message_cb(void *audio_handle, message_cb callback, void *user_data);
 #endif