From 1065b7a903751338e663867e33c2a6c2bee9f880 Mon Sep 17 00:00:00 2001 From: Jaechul Lee Date: Wed, 23 Aug 2023 13:45:43 +0900 Subject: [PATCH] Remove unnecessary code "PCM Playback Route" control always fails when pulseaudio starts because the control doesn't exist after upgrading kernel. [Version] 0.1.20 [Issue Type] Update Change-Id: I6dd9aecc8377778038cdd33d05f011a52a6a1e6c Signed-off-by: Jaechul Lee --- packaging/audio-hal-bcm2837.spec | 2 +- tizen-audio-routing.c | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/packaging/audio-hal-bcm2837.spec b/packaging/audio-hal-bcm2837.spec index 3f3eefd..74972cd 100644 --- a/packaging/audio-hal-bcm2837.spec +++ b/packaging/audio-hal-bcm2837.spec @@ -1,6 +1,6 @@ Name: audio-hal-bcm2837 Summary: TIZEN Audio HAL for BCM2837 -Version: 0.1.19 +Version: 0.1.20 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/tizen-audio-routing.c b/tizen-audio-routing.c index fbf0f8a..6c172bc 100644 --- a/tizen-audio-routing.c +++ b/tizen-audio-routing.c @@ -140,8 +140,6 @@ static audio_return_e __set_devices(audio_hal_s *ah, const char *verb, device_in return AUDIO_ERR_PARAMETER; } - /* Routing path is set only via __audio_routing_playback_rpi3() function, do nothing here. */ - return audio_ret; } @@ -169,8 +167,6 @@ static audio_return_e __update_route_ap_playback_capture(audio_hal_s *ah, audio_ } ah->device.mode = VERB_NORMAL; - /* Routing path is set only via __audio_routing_playback_rpi3() function, do nothing here. */ - return audio_ret; } @@ -239,25 +235,9 @@ static audio_return_e __update_route_reset(audio_hal_s *ah, uint32_t direction) return AUDIO_RET_OK; } - /* Routing path is set only via __audio_routing_playback_rpi3() function, do nothing here. */ - return audio_ret; } -static void __audio_routing_playback_rpi3(audio_hal_s *ah) -{ - int type; - int ret; - - ret = vconf_get_int(VCONFKEY_SOUND_RPI_PLAYBACK_ROUTE, &type); - if (ret != 0) { - AUDIO_LOG_ERROR("Failed to get vconf [%s], err [%d]", VCONFKEY_SOUND_RPI_PLAYBACK_ROUTE, ret); - return; - } - - _mixer_control_set_value(ah, "PCM Playback Route", type); -} - audio_return_e _audio_routing_init(audio_hal_s *ah) { audio_return_e audio_ret = AUDIO_RET_OK; @@ -268,9 +248,6 @@ audio_return_e _audio_routing_init(audio_hal_s *ah) ah->device.active_out = 0x0; ah->device.mode = VERB_NORMAL; - /* additional setting for rpi3 playback route mixer control */ - __audio_routing_playback_rpi3(ah); - return audio_ret; } -- 2.7.4