From b9a52549b00b5d2368cd2332b1c93602b1ab3552 Mon Sep 17 00:00:00 2001 From: Jaechul Lee Date: Thu, 11 Jul 2024 15:08:07 +0900 Subject: [PATCH] Remove vconf dependency for hal ABI compatibility [Version] 0.1.21 [Issue Type] Update Change-Id: Icdf911e45258716fc0c8bd859b089aa11f0043c2 Signed-off-by: Jaechul Lee --- configure.ac | 4 ---- packaging/audio-hal-bcm2837.spec | 3 +-- tizen-audio-routing.c | 14 ----------- tizen-audio-volume.c | 40 -------------------------------- 4 files changed, 1 insertion(+), 60 deletions(-) diff --git a/configure.ac b/configure.ac index 4d5b7c5..cb22621 100644 --- a/configure.ac +++ b/configure.ac @@ -35,10 +35,6 @@ else AM_CONDITIONAL(USE_TINYALSA, false) fi -PKG_CHECK_MODULES(VCONF, vconf) -AC_SUBST(VCONF_CFLAGS) -AC_SUBST(VCONF_LIBS) - PKG_CHECK_MODULES(INIPARSER, iniparser) AC_SUBST(INIPARSER_CFLAGS) AC_SUBST(INIPARSER_LIBS) diff --git a/packaging/audio-hal-bcm2837.spec b/packaging/audio-hal-bcm2837.spec index 74972cd..c64da9f 100644 --- a/packaging/audio-hal-bcm2837.spec +++ b/packaging/audio-hal-bcm2837.spec @@ -1,12 +1,11 @@ Name: audio-hal-bcm2837 Summary: TIZEN Audio HAL for BCM2837 -Version: 0.1.20 +Version: 0.1.21 Release: 0 Group: System/Libraries License: Apache-2.0 URL: http://tizen.org Source0: audio-hal-bcm2837-%{version}.tar.gz -BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(iniparser) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(alsa) diff --git a/tizen-audio-routing.c b/tizen-audio-routing.c index 6c172bc..4487df9 100644 --- a/tizen-audio-routing.c +++ b/tizen-audio-routing.c @@ -29,8 +29,6 @@ #include "tizen-audio-internal.h" #include "tizen-audio-impl.h" -#include - /* #define DEBUG_TIMING */ static device_type_s outDeviceTypes[] = { @@ -294,23 +292,11 @@ audio_return_e audio_update_route_option(void *audio_handle, audio_route_option_ { audio_return_e audio_ret = AUDIO_RET_OK; audio_hal_s *ah = (audio_hal_s *)audio_handle; - int ret; AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER); AUDIO_RETURN_VAL_IF_FAIL(option, AUDIO_ERR_PARAMETER); AUDIO_LOG_INFO("role:%s, name:%s, value:%d", option->role, option->name, option->value); - if (!strcmp("rpi playback route", option->name)) { - audio_ret = _mixer_control_set_value(ah, "PCM Playback Route", option->value); - if (audio_ret == AUDIO_RET_OK) { - ret = vconf_set_int(VCONFKEY_SOUND_RPI_PLAYBACK_ROUTE, option->value); - if (ret != 0) { - AUDIO_LOG_ERROR("Failed to set vconf [%s], err [%d]", VCONFKEY_SOUND_RPI_PLAYBACK_ROUTE, ret); - return AUDIO_ERR_INTERNAL; - } - } - } - return audio_ret; } diff --git a/tizen-audio-volume.c b/tizen-audio-volume.c index b176152..11e0813 100644 --- a/tizen-audio-volume.c +++ b/tizen-audio-volume.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "tizen-audio-internal.h" @@ -37,17 +36,6 @@ uint32_t g_master_volume_level = 100; -static const char *g_volume_vconf[AUDIO_VOLUME_TYPE_MAX] = { - "file/private/sound/volume/system", /* AUDIO_VOLUME_TYPE_SYSTEM */ - "file/private/sound/volume/notification", /* AUDIO_VOLUME_TYPE_NOTIFICATION */ - "file/private/sound/volume/alarm", /* AUDIO_VOLUME_TYPE_ALARM */ - "file/private/sound/volume/ringtone", /* AUDIO_VOLUME_TYPE_RINGTONE */ - "file/private/sound/volume/media", /* AUDIO_VOLUME_TYPE_MEDIA */ - "file/private/sound/volume/call", /* AUDIO_VOLUME_TYPE_CALL */ - "file/private/sound/volume/voip", /* AUDIO_VOLUME_TYPE_VOIP */ - "file/private/sound/volume/voice", /* AUDIO_VOLUME_TYPE_VOICE */ -}; - static const char *__get_volume_type_string_by_idx(uint32_t vol_type_idx) { switch (vol_type_idx) { @@ -263,28 +251,10 @@ static audio_return_e __load_volume_value_table_from_ini(audio_hal_s *ah) audio_return_e _audio_volume_init(audio_hal_s *ah) { - int i; - int val = 0; audio_return_e audio_ret = AUDIO_RET_OK; - int init_value[AUDIO_VOLUME_TYPE_MAX] = { 9, 11, 7, 11, 7, 4, 4, 7 }; AUDIO_RETURN_VAL_IF_FAIL(ah, AUDIO_ERR_PARAMETER); - for (i = 0; i < AUDIO_VOLUME_TYPE_MAX; i++) { - ah->volume.volume_level[i] = init_value[i]; - } - - for (i = 0; i < AUDIO_VOLUME_TYPE_MAX; i++) { - /* Get volume value string from VCONF */ - if (vconf_get_int(g_volume_vconf[i], &val) < 0) { - AUDIO_LOG_ERROR("vconf_get_int(%s) failed", g_volume_vconf[i]); - continue; - } - - AUDIO_LOG_INFO("read vconf. %s = %d", g_volume_vconf[i], val); - ah->volume.volume_level[i] = val; - } - if (!(ah->volume.volume_value_table = malloc(AUDIO_VOLUME_DEVICE_MAX * sizeof(audio_volume_value_table_s)))) { AUDIO_LOG_ERROR("volume_value_table malloc failed"); return AUDIO_ERR_RESOURCE; @@ -342,10 +312,6 @@ audio_return_e audio_get_volume_level(void *audio_handle, audio_volume_info_s *i return AUDIO_RET_OK; } - *level = ah->volume.volume_level[__get_volume_idx_by_string_type(info->type)]; - - AUDIO_LOG_INFO("get [%s] volume_level: %d, direction(%d)", info->type, *level, info->direction); - return AUDIO_RET_OK; } @@ -386,12 +352,6 @@ audio_return_e audio_set_volume_level(void *audio_handle, audio_volume_info_s *i } AUDIO_RETURN_VAL_IF_FAIL((ah->volume.volume_level_max[__get_volume_idx_by_string_type(info->type)] >= level), AUDIO_ERR_PARAMETER); - /* Update volume level */ - ah->volume.volume_level[__get_volume_idx_by_string_type(info->type)] = level; - AUDIO_LOG_INFO("set [%s] volume_level: %d, direction(%d)", info->type, level, info->direction); - - /* set mixer related to H/W volume if needed */ - return audio_ret; } -- 2.34.1