openharmony/third_party_alsa-lib
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_alsa-lib synced 2024-11-23 07:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snd_dlopen: do not use absolute plugin path for snd_dlopen() calls

Browse Source 
In commit b906db19ef, the snd_dlopen()
implements the automatic lookup to the ALSA_PLUGIN_DIR directory.
It is not necessary to add the absolute paths in callers now.

The plugin names are also searched in ld.so.conf paths as the fallback now,
but it should not be a big problem.

BugLink: https://github.com/alsa-project/alsa-lib/issues/34
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2020-06-04 18:22:59 +02:00
parent 577df365f6
commit b2a4272ecb
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mixer/simple/sbasedl.c
View File

@ -33,7 +33,7 @@
#include "mixer_abst.h"
#include "sbase.h"
#define SO_PATH ALSA_PLUGIN_DIR "/smixer"
#define SO_PATH "smixer"
int mixer_simple_basic_dlopen(snd_mixer_class_t *class,
bclass_base_ops_t **ops)

4
src/control/control.c
View File

@ -1337,13 +1337,13 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
build_in++;
}
if (*build_in == NULL) {
buf1 = malloc(strlen(str) + sizeof(ALSA_PLUGIN_DIR) + 32);
buf1 = malloc(strlen(str) + 32);
if (buf1 == NULL) {
err = -ENOMEM;
goto _err;
}
lib = buf1;
sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str);
sprintf(buf1, "libasound_module_ctl_%s.so", str);
}
}
#ifndef PIC

2
src/mixer/simple_abst.c
View File

@ -40,7 +40,7 @@
#ifndef DOC_HIDDEN
#define SO_PATH ALSA_PLUGIN_DIR "/smixer"
#define SO_PATH "smixer"
typedef struct _class_priv {
char *device;

4
src/pcm/pcm.c
View File

@ -2578,13 +2578,13 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
build_in++;
}
if (*build_in == NULL) {
buf1 = malloc(strlen(str) + sizeof(ALSA_PLUGIN_DIR) + 32);
buf1 = malloc(strlen(str) + 32);
if (buf1 == NULL) {
err = -ENOMEM;
goto _err;
}
lib = buf1;
sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str);
sprintf(buf1, "libasound_module_pcm_%s.so", str);
}
}
#ifndef PIC

4
src/pcm/pcm_rate.c
View File

@ -1281,7 +1281,7 @@ static const char *const default_rate_plugins[] = {
static int rate_open_func(snd_pcm_rate_t *rate, const char *type, const snd_config_t *converter_conf, int verbose)
{
char open_name[64], open_conf_name[64], lib_name[128], *lib = NULL;
char open_name[64], open_conf_name[64], lib_name[64], *lib = NULL;
snd_pcm_rate_open_func_t open_func;
snd_pcm_rate_open_conf_func_t open_conf_func;
int err;
@ -1290,7 +1290,7 @@ static int rate_open_func(snd_pcm_rate_t *rate, const char *type, const snd_conf
snprintf(open_conf_name, sizeof(open_conf_name), "_snd_pcm_rate_%s_open_conf", type);
if (!is_builtin_plugin(type)) {
snprintf(lib_name, sizeof(lib_name),
"%s/libasound_module_rate_%s.so", ALSA_PLUGIN_DIR, type);
"libasound_module_rate_%s.so", type);
lib = lib_name;
}