From f351df195c8c54408d0e34391387d87e763894bb Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Thu, 12 Nov 2015 14:43:24 +0900 Subject: [PATCH] stream-manager: Fix bug to update route type even if a stream does not have any volume type [Version] 5.0.12 [Profile] Common [Issue Type] Bug fix Change-Id: I4fdf1469dfd84ceaa336a7c46bd6b019385939c1 Signed-off-by: Sangchul Lee --- packaging/pulseaudio-modules-tizen.spec | 2 +- src/stream-manager.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec index f557b0a..f49ae79 100644 --- a/packaging/pulseaudio-modules-tizen.spec +++ b/packaging/pulseaudio-modules-tizen.spec @@ -3,7 +3,7 @@ Name: pulseaudio-modules-tizen Summary: Improved Linux sound server -Version: 5.0.11 +Version: 5.0.12 Release: 0 Group: Multimedia/Audio License: LGPL-2.1+ diff --git a/src/stream-manager.c b/src/stream-manager.c index 0bc505f..5ac72ad 100644 --- a/src/stream-manager.c +++ b/src/stream-manager.c @@ -2081,13 +2081,6 @@ static process_stream_result_t process_stream(pa_stream_manager *m, stream_type_ result = PROCESS_STREAM_RESULT_STOP; goto FAILURE; } - /* update the volume type of this stream */ - ret = update_volume_type_of_stream(m, type, stream, role); - if (ret == FALSE) { - pa_log_error("could not update the volume type of '%s' role.", role); - result = PROCESS_STREAM_RESULT_STOP; - goto FAILURE; - } /* update the route type of this stream */ ret = update_route_type_of_stream(m, stream, type, role); if (ret == FALSE) { @@ -2095,6 +2088,10 @@ static process_stream_result_t process_stream(pa_stream_manager *m, stream_type_ result = PROCESS_STREAM_RESULT_STOP; goto FAILURE; } + /* update the volume type of this stream */ + ret = update_volume_type_of_stream(m, type, stream, role); + if (ret == FALSE) + pa_log_warn("could not update the volume type of '%s' role.", role); /* skip route types */ if ((route_type_str = pa_proplist_gets(GET_STREAM_NEW_PROPLIST(stream, type), PA_PROP_MEDIA_ROLE_ROUTE_TYPE))) { -- 2.7.4