stream-manager: Fix wrong stream type when calling set_volume_mute_by_idx()

[Version] 5.0.131
[Profile] Common
[Issue Type] Bug fix

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

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 2e380d0..1b4ba0b 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.130
+Version:          5.0.131
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/stream-manager.c b/src/stream-manager.c
index 8c86793..366e78a 100644 (file)
--- a/src/stream-manager.c
+++ b/src/stream-manager.c
@@ -3237,15 +3237,13 @@ static pa_hook_result_t sink_input_state_changed_cb(pa_core *core, pa_sink_input
     pa_log_debug("start sink_input_state_changed_cb(), sink-input(%p), state(%d)", i, state);
 
     switch (state) {
-    case PA_SINK_INPUT_CORKED: {
+    case PA_SINK_INPUT_CORKED:
         process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_ENDED, false);
         break;
-    }
     case PA_SINK_INPUT_DRAINED:
-    case PA_SINK_INPUT_RUNNING: {
+    case PA_SINK_INPUT_RUNNING:
         process_stream(m, i, STREAM_SINK_INPUT, PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_STARTED, false);
         break;
-    }
     default:
         break;
     }
@@ -3341,14 +3339,12 @@ static pa_hook_result_t source_output_state_changed_cb(pa_core *core, pa_source_
     pa_log_debug("start source_output_state_changed_cb(), source-output(%p), state(%d)", o, state);
 
     switch (state) {
-    case PA_SOURCE_OUTPUT_CORKED: {
+    case PA_SOURCE_OUTPUT_CORKED:
         process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_ENDED, false);
         break;
-    }
-    case PA_SOURCE_OUTPUT_RUNNING: {
+    case PA_SOURCE_OUTPUT_RUNNING:
         process_stream(m, o, STREAM_SOURCE_OUTPUT, PROCESS_COMMAND_CHANGE_ROUTE_BY_STREAM_STARTED, false);
         break;
-    }
     default:
         break;
     }
@@ -3366,7 +3362,7 @@ static pa_hook_result_t source_output_move_start_cb(pa_core *core, pa_source_out
 
     pa_log_debug("source_output_move_start_cb, o(%p, index:%u)", o, o->index);
 
-    set_volume_mute_by_idx(m, o->index, STREAM_SINK_INPUT, true);
+    set_volume_mute_by_idx(m, o->index, STREAM_SOURCE_OUTPUT, true);
 
     return PA_HOOK_OK;
 }
@@ -3381,7 +3377,7 @@ static pa_hook_result_t source_output_move_finish_cb(pa_core *core, pa_source_ou
 
     pa_log_debug("source_output_move_finish_cb, o(%p, index:%u)", o, o->index);
 
-    set_volume_mute_by_idx(m, o->index, STREAM_SINK_INPUT, false);
+    set_volume_mute_by_idx(m, o->index, STREAM_SOURCE_OUTPUT, false);
 
     return PA_HOOK_OK;
 }
@@ -3429,8 +3425,7 @@ static void find_next_device_for_auto_route(pa_stream_manager *m, stream_route_t
                 if ((*next_device = pa_device_manager_get_device(m->dm, device_type))) {
                     pa_log_debug("found next device[%s, %p]", device_type, *next_device);
                     break;
-                } else
-                    continue;
+                }
             }
         }
     } else if (route_type == STREAM_ROUTE_TYPE_AUTO_LAST_CONNECTED) {