diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c index d8cbf0f1..a1b33ccc 100644 --- a/modules/mixer/simple/sbasedl.c +++ b/modules/mixer/simple/sbasedl.c @@ -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) diff --git a/src/control/control.c b/src/control/control.c index 27f42135..19528ae3 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -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 diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c index 9c61cb58..4dcc4cc7 100644 --- a/src/mixer/simple_abst.c +++ b/src/mixer/simple_abst.c @@ -40,7 +40,7 @@ #ifndef DOC_HIDDEN -#define SO_PATH ALSA_PLUGIN_DIR "/smixer" +#define SO_PATH "smixer" typedef struct _class_priv { char *device; diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 261e80ac..98b5ced4 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -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 diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 9ec8c85e..5bf7dbb9 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -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; }