hal-manager: Rename APIs as per HAL API changes

rename pa_hal_manager_do_route() to pa_hal_manager_update_route().
rename pa_hal_manager_update_stream_connection_info() to pa_hal_manager_notify_stream_connection_changed().

[Version] 5.0.48
[Profile] Common
[Issue Type] Feature enhancement

Change-Id: I8f3431fe75c3bf9ba4f6b57ec876531c0a3340cc
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index f784a52f53ef8ccd7a1eb62f811bd297baf323c4..d3088c0db9c7604a632d9f546945cd2cb363aa9f 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          5.0.47
+Version:          5.0.48
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/hal-manager.c b/src/hal-manager.c
index 9cb6fda482e4d5d8195beb3da7861c201e923de2..75cbd05190cb21b0e16d4d3b1d4b4ce1ca9a18fd 100644 (file)
--- a/src/hal-manager.c
+++ b/src/hal-manager.c
@@ -64,9 +64,9 @@ pa_hal_manager* pa_hal_manager_get(pa_core *core) {
         h->intf.get_volume_value = dlsym(h->dl_handle, "audio_get_volume_value");
         h->intf.get_volume_mute = dlsym(h->dl_handle, "audio_get_volume_mute");
         h->intf.set_volume_mute = dlsym(h->dl_handle, "audio_set_volume_mute");
-        h->intf.do_route = dlsym(h->dl_handle, "audio_do_route");
+        h->intf.update_route = dlsym(h->dl_handle, "audio_update_route");
         h->intf.update_route_option = dlsym(h->dl_handle, "audio_update_route_option");
-        h->intf.update_stream_connection_info  = dlsym(h->dl_handle, "audio_update_stream_connection_info");
+        h->intf.notify_stream_connection_changed = dlsym(h->dl_handle, "audio_notify_stream_connection_changed");
         h->intf.get_buffer_attr = dlsym(h->dl_handle, "audio_get_buffer_attr");
         h->intf.pcm_open = dlsym(h->dl_handle, "audio_pcm_open");
         h->intf.pcm_start = dlsym(h->dl_handle, "audio_pcm_start");
@@ -243,15 +243,15 @@ int32_t pa_hal_manager_set_volume_mute(pa_hal_manager *h, const char *volume_typ
     return ret;
 }
 
-int32_t pa_hal_manager_do_route(pa_hal_manager *h, hal_route_info *info) {
+int32_t pa_hal_manager_update_route(pa_hal_manager *h, hal_route_info *info) {
     int32_t ret = 0;
     audio_return_t hal_ret = AUDIO_RET_OK;
 
     pa_assert(h);
     pa_assert(info);
 
-    if (AUDIO_IS_ERROR((hal_ret = h->intf.do_route(h->ah_handle, (audio_route_info_t*)info)))) {
-        pa_log_error("do_route returns error:0x%x", hal_ret);
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.update_route(h->ah_handle, (audio_route_info_t*)info)))) {
+        pa_log_error("update_route returns error:0x%x", hal_ret);
         ret = -1;
     }
     return ret;
@@ -271,7 +271,7 @@ int32_t pa_hal_manager_update_route_option(pa_hal_manager *h, hal_route_option *
     return ret;
 }
 
-int32_t pa_hal_manager_update_stream_connection_info(pa_hal_manager *h, hal_stream_connection_info *info) {
+int32_t pa_hal_manager_notify_stream_connection_changed(pa_hal_manager *h, hal_stream_connection_info *info) {
     int32_t ret = 0;
     audio_return_t hal_ret = AUDIO_RET_OK;
     audio_stream_info_t hal_info;
@@ -283,8 +283,8 @@ int32_t pa_hal_manager_update_stream_connection_info(pa_hal_manager *h, hal_stre
     hal_info.direction = info->direction;
     hal_info.idx = info->idx;
 
-    if (AUDIO_IS_ERROR((hal_ret = h->intf.update_stream_connection_info(h->ah_handle, &hal_info, (uint32_t)info->is_connected)))) {
-        pa_log_error("update_stream_connection_info returns error:0x%x", hal_ret);
+    if (AUDIO_IS_ERROR((hal_ret = h->intf.notify_stream_connection_changed(h->ah_handle, &hal_info, (uint32_t)info->is_connected)))) {
+        pa_log_error("notify_tream_connection_changed returns error:0x%x", hal_ret);
         ret = -1;
     }
     return ret;

diff --git a/src/hal-manager.h b/src/hal-manager.h
index d528d5c39ed4bbbba7011ed1437d3b905699ecb6..4375e6ae5f38b79118c686868dea8791f1b79cb5 100644 (file)
--- a/src/hal-manager.h
+++ b/src/hal-manager.h
@@ -56,9 +56,9 @@ int32_t pa_hal_manager_set_volume_level(pa_hal_manager *h, const char *volume_ty
 int32_t pa_hal_manager_get_volume_value(pa_hal_manager *h, const char *volume_type, const char *gain_type, io_direction_t direction, uint32_t level, double *value);
 int32_t pa_hal_manager_get_volume_mute(pa_hal_manager *h, const char *volume_type, io_direction_t direction, uint32_t *mute);
 int32_t pa_hal_manager_set_volume_mute(pa_hal_manager *h, const char *volume_type, io_direction_t direction, uint32_t mute);
-int32_t pa_hal_manager_do_route(pa_hal_manager *h, hal_route_info *info);
+int32_t pa_hal_manager_update_route(pa_hal_manager *h, hal_route_info *info);
 int32_t pa_hal_manager_update_route_option(pa_hal_manager *h, hal_route_option *option);
-int32_t pa_hal_manager_update_stream_connection_info(pa_hal_manager *h, hal_stream_connection_info *info);
+int32_t pa_hal_manager_notify_stream_connection_changed(pa_hal_manager *h, hal_stream_connection_info *info);
 int32_t pa_hal_manager_get_buffer_attribute(pa_hal_manager *h, hal_stream_info *info, uint32_t *maxlength, uint32_t *tlength, uint32_t *prebuf, uint32_t* minreq, uint32_t *fragsize);
 int32_t pa_hal_manager_pcm_open(pa_hal_manager *h, pcm_handle *pcm_h, io_direction_t direction, pa_sample_spec *sample_spec, uint32_t period_size, uint32_t periods);
 int32_t pa_hal_manager_pcm_start(pa_hal_manager *h, pcm_handle pcm_h);

diff --git a/src/module-policy.c b/src/module-policy.c
index 3e59a027ec0fb14b88ea1b68dc5480dd80a96a9d..cec90d603de3c000065f20da4c66502ca5f85d27 100644 (file)
--- a/src/module-policy.c
+++ b/src/module-policy.c
@@ -964,9 +964,9 @@ static pa_hook_result_t route_change_hook_cb(pa_core *c, pa_stream_manager_hook_
     }
 
     if (route_info.device_infos) {
-        /* send information to HAL to set routing */
-        if (pa_hal_manager_do_route(u->hal_manager, &route_info))
-            pa_log_error("[ROUTE] Failed to pa_hal_manager_do_route()");
+        /* send information to HAL to update route */
+        if (pa_hal_manager_update_route(u->hal_manager, &route_info))
+            pa_log_error("[ROUTE] Failed to pa_hal_manager_update_route()");
         pa_xfree(route_info.device_infos);
     }
 

diff --git a/src/stream-manager.c b/src/stream-manager.c
index 00166cedc99e14ac0037f2919ebd3917e01ea7d7..64c17c65daceb7930f719f97a3abafb387e154d4 100644 (file)
--- a/src/stream-manager.c
+++ b/src/stream-manager.c
@@ -2158,7 +2158,7 @@ static void do_notify(pa_stream_manager *m, notify_command_type_t command, strea
             stream_conn_info.direction = (type == STREAM_SINK_INPUT) ? DIRECTION_OUT : DIRECTION_IN;
             stream_conn_info.idx = (type == STREAM_SINK_INPUT) ? ((pa_sink_input*)s)->index : ((pa_source_output*)s)->index;
             stream_conn_info.is_connected = (command == NOTIFY_COMMAND_INFORM_STREAM_CONNECTED) ? true : false;
-            pa_hal_manager_update_stream_connection_info(m->hal, &stream_conn_info);
+            pa_hal_manager_notify_stream_connection_changed(m->hal, &stream_conn_info);
         }
         break;
     }

diff --git a/src/tizen-audio.h b/src/tizen-audio.h
index 1a3e956c8f9a7e7ba39b3fe6db8bf9832d9585ff..6c52e71dce47b352925ece78165c5bb26ea8ae5b 100644 (file)
--- a/src/tizen-audio.h
+++ b/src/tizen-audio.h
@@ -86,10 +86,10 @@ typedef struct audio_interface {
     audio_return_t (*get_volume_mute)(void *audio_handle, audio_volume_info_t *info, uint32_t *mute);
     audio_return_t (*set_volume_mute)(void *audio_handle, audio_volume_info_t *info, uint32_t mute);
     /* Routing */
-    audio_return_t (*do_route)(void *audio_handle, audio_route_info_t *info);
+    audio_return_t (*update_route)(void *audio_handle, audio_route_info_t *info);
     audio_return_t (*update_route_option)(void *audio_handle, audio_route_option_t *option);
     /* Stream */
-    audio_return_t (*update_stream_connection_info) (void *audio_handle, audio_stream_info_t *info, uint32_t is_connected);
+    audio_return_t (*notify_stream_connection_changed)(void *audio_handle, audio_stream_info_t *info, uint32_t is_connected);
     /* Buffer attribute */
     audio_return_t (*get_buffer_attr)(void *audio_handle, uint32_t direction, const char *latency, uint32_t samplerate, int format, uint32_t channels,
                                       uint32_t *maxlength, uint32_t *tlength, uint32_t *prebuf, uint32_t* minreq, uint32_t *fragsize);
@@ -118,9 +118,9 @@ audio_return_t audio_set_volume_level(void *audio_handle, audio_volume_info_t *i
 audio_return_t audio_get_volume_value(void *audio_handle, audio_volume_info_t *info, uint32_t level, double *value);
 audio_return_t audio_get_volume_mute(void *audio_handle, audio_volume_info_t *info, uint32_t *mute);
 audio_return_t audio_set_volume_mute(void *audio_handle, audio_volume_info_t *info, uint32_t mute);
-audio_return_t audio_do_route(void *audio_handle, audio_route_info_t *info);
+audio_return_t audio_update_route(void *audio_handle, audio_route_info_t *info);
 audio_return_t audio_update_route_option(void *audio_handle, audio_route_option_t *option);
-audio_return_t audio_update_stream_connection_info(void *audio_handle, audio_stream_info_t *info, uint32_t is_connected);
+audio_return_t audio_notify_stream_connection_changed(void *audio_handle, audio_stream_info_t *info, uint32_t is_connected);
 audio_return_t audio_get_buffer_attr(void *audio_handle, uint32_t direction, const char *latency, uint32_t samplerate, int format, uint32_t channels,
                                      uint32_t *maxlength, uint32_t *tlength, uint32_t *prebuf, uint32_t* minreq, uint32_t *fragsize);
 audio_return_t audio_pcm_open(void *audio_handle, void **pcm_handle, uint32_t direction, void *sample_spec, uint32_t period_size, uint32_t periods);