Changeset 5487:882b4283f8d7 in roaraudio

Timestamp:

04/30/12 03:12:01 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support getting plugin by name

Files:

• include/libroar/plugincontainer.h (modified) (1 diff)
• libroar/plugincontainer.c (modified) (3 diffs)

include/libroar/plugincontainer.h

@@ -58 +58 @@
 int roar_plugincontainer_unref(struct roar_plugincontainer * cont);
 
-/*
- * stuff we still need:
- * object creation, get plugin handle.
+/* Get a lhandle by name of the loaded plugin
  */
+struct roar_dl_lhandle * roar_plugincontainer_get_lhandle_by_name (struct roar_plugincontainer * cont,
+                                                                   const char * name);
 
 // plugin loading and unloading:

libroar/plugincontainer.c

@@ -233 +233 @@
 }
 
+struct roar_dl_lhandle * roar_plugincontainer_get_lhandle_by_name (struct roar_plugincontainer * cont,
+                                                                   const char * name) {
+ const struct roar_dl_libraryname * libname;
+ size_t i;
+
+ if ( cont == NULL || name == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return NULL;
+ }
+
+ for (i = 0; i < MAX_PLUGINS; i++) {
+  if ( cont->handle[i] == NULL )
+   continue;
+  libname = roar_dl_getlibname(cont->handle[i]);
+  if ( libname == NULL )
+   continue;
+
+  if ( !strcmp(libname->name, name) ) {
+   if ( roar_dl_ref(cont->handle[i]) == -1 )
+    return NULL;
+
+   return cont->handle[i];
+  }
+ }
+
+ roar_err_set(ROAR_ERROR_NOENT);
+ return NULL;
+}
+
 // plugin loading and unloading:
 int roar_plugincontainer_load(struct roar_plugincontainer * cont, const char * name, struct roar_dl_librarypara * para) {
@@ -304 +333 @@
 
 int roar_plugincontainer_unload(struct roar_plugincontainer * cont, const char * name) {
- const struct roar_dl_libraryname * libname;
- size_t i;
+ struct roar_dl_lhandle * lhandle;
 
  if ( cont == NULL || name == NULL ) {
@@ -312 +340 @@
  }
 
- for (i = 0; i < MAX_PLUGINS; i++) {
-  if ( cont->handle[i] == NULL )
-   continue;
-  libname = roar_dl_getlibname(cont->handle[i]);
-  if ( libname == NULL )
-   continue;
-
-  if ( !strcmp(libname->name, name) )
-   return roar_plugincontainer_unload_lhandle(cont, cont->handle[i]);
- }
-
- roar_err_set(ROAR_ERROR_NOENT);
- return -1;
+ lhandle = roar_plugincontainer_get_lhandle_by_name(cont, name);
+ if ( lhandle == NULL )
+  return -1;
+
+ roar_dl_unref(lhandle); // we can do this early here as the handle stay valid in the container's array.
+
+ return roar_plugincontainer_unload_lhandle(cont, lhandle);
 }