stream-manager: Rename enum and function

Incorrect names are revised generically to embrace the actual doing
in the function.

[Version] 13.0.53
[Issue Type] Rename

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

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 2d4862d..6c7bd8b 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:          13.0.52
+Version:          13.0.53
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/stream-manager-priv.h b/src/stream-manager-priv.h
index 390b156..677deff 100644 (file)
--- a/src/stream-manager-priv.h
+++ b/src/stream-manager-priv.h
@@ -72,8 +72,8 @@ typedef enum _process_command_type {
     PROCESS_COMMAND_CHANGE_ROUTE_BY_STATE_CHANGED_CORKED,
     PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_FOCUS_CHANGED,
     PROCESS_COMMAND_UPDATE_VOLUME,
-    PROCESS_COMMAND_ADD_PARENT_ID,
-    PROCESS_COMMAND_REMOVE_PARENT_ID,
+    PROCESS_COMMAND_ADD_STREAM,
+    PROCESS_COMMAND_REMOVE_STREAM,
     PROCESS_COMMAND_UPDATE_BUFFER_ATTR,
     PROCESS_COMMAND_APPLY_FILTER,
 } process_command_type_t;

diff --git a/src/stream-manager.c b/src/stream-manager.c
index c2b4c80..8ff7dde 100644 (file)
--- a/src/stream-manager.c
+++ b/src/stream-manager.c
@@ -89,8 +89,8 @@ static const char* process_command_type_str[] = {
     [PROCESS_COMMAND_CHANGE_ROUTE_BY_STATE_CHANGED_CORKED] = "CHANGE_ROUTE_BY_STATE_CHANGED_CORKED",
     [PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_FOCUS_CHANGED] = "CHANGE_ROUTE_BY_STREAM_FOCUS_CHANGED",
     [PROCESS_COMMAND_UPDATE_VOLUME] = "UPDATE_VOLUME",
-    [PROCESS_COMMAND_ADD_PARENT_ID] = "ADD_PARENT_ID",
-    [PROCESS_COMMAND_REMOVE_PARENT_ID] = "REMOVE_PARENT_ID",
+    [PROCESS_COMMAND_ADD_STREAM] = "ADD_STREAM",
+    [PROCESS_COMMAND_REMOVE_STREAM] = "REMOVE_STREAM",
     [PROCESS_COMMAND_UPDATE_BUFFER_ATTR] = "UPDATE_BUFFER_ATTR",
     [PROCESS_COMMAND_APPLY_FILTER] = "APPLY_FILTER",
 };
@@ -1230,12 +1230,12 @@ static bool update_stream_parent_info(pa_stream_manager *m, process_command_type
         sp = pa_hashmap_get(m->stream_parents, (const void*)parent_idx);
         if (sp) {
             uint32_t idx = GET_STREAM_INDEX(stream, type);
-            if (command == PROCESS_COMMAND_ADD_PARENT_ID) {
+            if (command == PROCESS_COMMAND_ADD_STREAM) {
                 /* append this stream to the parent stream info. */
                 pa_log_debug(" - append this stream(%p, %u) to the list. sp(%p), stream_type(%d)", stream, idx, sp, type);
                 pa_idxset_put(type == STREAM_SINK_INPUT ? (sp->idx_sink_inputs) : (sp->idx_source_outputs), stream, NULL);
                 return true;
-            } else if (command == PROCESS_COMMAND_REMOVE_PARENT_ID) {
+            } else if (command == PROCESS_COMMAND_REMOVE_STREAM) {
                 /* remove this stream from the parent stream info. */
                 pa_log_debug(" - remove this stream(%p, %u) from the list. sp(%p), stream_type(%d)", stream, idx, sp, type);
                 pa_idxset_remove_by_data(type == STREAM_SINK_INPUT ? (sp->idx_sink_inputs) : (sp->idx_source_outputs), stream, NULL);
@@ -2280,7 +2280,7 @@ static process_stream_result_t handle_command_update_volume(pa_stream_manager *m
     return PROCESS_STREAM_RESULT_OK;
 }
 
-static process_stream_result_t handle_command_add_remove_parent_id(pa_stream_manager *m, process_command_type_t command,
+static process_stream_result_t handle_command_add_remove_stream(pa_stream_manager *m, process_command_type_t command,
                                             void *stream, stream_type_t type, bool is_new_data) {
     const char *role = NULL;
     const char *route_type_str = NULL;
@@ -2289,8 +2289,8 @@ static process_stream_result_t handle_command_add_remove_parent_id(pa_stream_man
     pa_assert(m);
     pa_assert(stream);
 
-    if (command != PROCESS_COMMAND_ADD_PARENT_ID &&
-        command != PROCESS_COMMAND_REMOVE_PARENT_ID)
+    if (command != PROCESS_COMMAND_ADD_STREAM &&
+        command != PROCESS_COMMAND_REMOVE_STREAM)
         return PROCESS_STREAM_RESULT_SKIP;
 
     if (!(role = pa_proplist_gets(GET_STREAM_PROPLIST(stream, type), PA_PROP_MEDIA_ROLE))) {
@@ -2309,7 +2309,7 @@ static process_stream_result_t handle_command_add_remove_parent_id(pa_stream_man
     }
 
     if (!IS_ROUTE_TYPE_FOR_EXTERNAL_DEV(route_type_str, route_type)) {
-        if (command == PROCESS_COMMAND_ADD_PARENT_ID && CHECK_STREAM_RUNNING(stream, type)) {
+        if (command == PROCESS_COMMAND_ADD_STREAM && CHECK_STREAM_RUNNING(stream, type)) {
             if (type == STREAM_SINK_INPUT && m->cur_highest_priority.need_to_update_si) {
                 m->cur_highest_priority.sink_input = stream;
                 m->cur_highest_priority.role_si = role;
@@ -2373,9 +2373,9 @@ process_stream_result_t process_stream(pa_stream_manager *m, void *stream, strea
     case PROCESS_COMMAND_UPDATE_VOLUME:
         result = handle_command_update_volume(m, stream, type, is_new_data);
         break;
-    case PROCESS_COMMAND_ADD_PARENT_ID:
-    case PROCESS_COMMAND_REMOVE_PARENT_ID:
-        result = handle_command_add_remove_parent_id(m, command, stream, type, is_new_data);
+    case PROCESS_COMMAND_ADD_STREAM:
+    case PROCESS_COMMAND_REMOVE_STREAM:
+        result = handle_command_add_remove_stream(m, command, stream, type, is_new_data);
         break;
     case PROCESS_COMMAND_UPDATE_BUFFER_ATTR:
         update_buffer_attribute(m, stream, type, is_new_data);
@@ -2507,7 +2507,7 @@ static pa_hook_result_t sink_input_put_cb(pa_core *core, pa_sink_input *i, pa_st
 
     pa_log_info("sink-input(%p, index:%u)", i, i->index);
 
-    process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_ADD_PARENT_ID, false);
+    process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_ADD_STREAM, false);
     process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_APPLY_FILTER, false);
     process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_UPDATE_VOLUME, false);
     if (is_stream_related_call_active_routing(PA_OBJECT(i))) {
@@ -2534,7 +2534,7 @@ static pa_hook_result_t sink_input_unlink_cb(pa_core *core, pa_sink_input *i, pa
     remove_sink_input_from_muted_streams(m, i);
     remove_sink_input_from_ducking_streams(m, i);
 
-    process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_REMOVE_PARENT_ID, false);
+    process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_REMOVE_STREAM, false);
     process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_ENDED, false);
 
     return PA_HOOK_OK;
@@ -2668,7 +2668,7 @@ static pa_hook_result_t source_output_put_cb(pa_core *core, pa_source_output *o,
     pa_log_info("source-output(%p, index:%u)", o, o->index);
 
     update_mirroring_streams(m, o, true);
-    process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_ADD_PARENT_ID, false);
+    process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_ADD_STREAM, false);
     process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_UPDATE_VOLUME, false);
     if (is_stream_related_call_active_routing(PA_OBJECT(o))) {
         change_active_route_for_call(m, PA_OBJECT(o), true);
@@ -2690,7 +2690,7 @@ static pa_hook_result_t source_output_unlink_cb(pa_core *core, pa_source_output
     }
     update_mirroring_streams(m, o, false);
     process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_ENDED, false);
-    process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_REMOVE_PARENT_ID, false);
+    process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_REMOVE_STREAM, false);
 
     return PA_HOOK_OK;
 }