Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv29326
Modified Files:
pcm_ladspa.c
Log Message:
Do not use snd_dl*() functions, dev->activate can be NULL
Index: pcm_ladspa.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_ladspa.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pcm_ladspa.c 11 Feb 2003 18:14:47 -0000 1.12
+++ pcm_ladspa.c 14 Jun 2003 07:31:54 -0000 1.13
@@ -156,7 +156,7 @@
while (!list_empty(plugins)) {
snd_pcm_ladspa_plugin_t *plugin = list_entry(plugins->next,
snd_pcm_ladspa_plugin_t, list);
if (plugin->dl_handle)
- snd_dlclose(plugin->dl_handle);
+ dlclose(plugin->dl_handle);
if (plugin->filename)
free(plugin->filename);
list_del(&plugin->list);
@@ -412,7 +412,8 @@
return -EINVAL;
}
list_add_tail(&instance->list, &plugin->instances);
- plugin->desc->activate(instance->handle);
+ if (plugin->desc->activate)
+ plugin->desc->activate(instance->handle);
if (plugin->policy == SND_PCM_LADSPA_POLICY_DUPLICATE) {
err = snd_pcm_ladspa_connect_plugin_duplicate(plugin,
&plugin->input, instance, idx);
if (err < 0) {
@@ -719,9 +720,9 @@
void *handle;
assert(filename);
- handle = snd_dlopen(filename, RTLD_LAZY);
+ handle = dlopen(filename, RTLD_LAZY);
if (handle) {
- LADSPA_Descriptor_Function fcn =
(LADSPA_Descriptor_Function)snd_dlsym(handle, "ladspa_descriptor",
SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION));
+ LADSPA_Descriptor_Function fcn =
(LADSPA_Descriptor_Function)dlsym(handle, "ladspa_descriptor",
SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION));
if (fcn) {
long idx;
const LADSPA_Descriptor *d;
@@ -738,7 +739,7 @@
return 1;
}
}
- snd_dlclose(handle);
+ dlclose(handle);
}
return -ENOENT;
}
-------------------------------------------------------
This SF.NET email is sponsored by: eBay
Great deals on office technology -- on eBay now! Click here:
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
