Changeset 5567:6ecf012d7063 in roaraudio for roard/plugins.c

Timestamp:

07/16/12 17:02:17 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

roard now tries to auto load missing protocols as plugins (Closes: #275)

File:

• roard/plugins.c (modified) (3 diffs)

roard/plugins.c

@@ -35 +35 @@
 static struct _roard_plugin * _pp = NULL;
 
+static int _plugins_inited = 0;
+
 static struct _roard_plugin * _find_free(void) {
  int i;
@@ -78 +80 @@
 }
 
+static int plugins_init_one(struct _roard_plugin * plugin) {
+ if ( plugin == NULL )
+  return -1;
+
+ _pp = plugin;
+ _pp->sched = NULL;
+
+ if ( roar_dl_ra_init(plugin->lhandle, NULL, NULL) == -1 ) {
+  ROAR_WARN("plugins_init(void): Can not RA init lib at %p: %s", plugin->lhandle, roar_error2str(roar_error));
+  plugins_delete(plugin);
+  return -1;
+ }
+
+ if ( plugin->sched != NULL ) {
+  if ( plugin->sched->init != NULL ) {
+   roar_dl_context_restore(plugin->lhandle);
+   plugin->sched->init();
+   roar_dl_context_store(plugin->lhandle);
+  }
+ }
+
+ roar_dl_appsched_trigger(plugin->lhandle, ROAR_DL_APPSCHED_INIT);
+
+ _pp = NULL;
+
+ return 0;
+}
+
 int plugins_init  (void) {
- int i;
+ size_t i;
+
+ if ( _plugins_inited ) {
+  roar_err_set(ROAR_ERROR_BUSY);
+  return -1;
+ }
 
  for (i = 0; i < MAX_PLUGINS; i++) {
   if ( g_plugins[i].lhandle != NULL ) {
-   _pp = &(g_plugins[i]);
-
-   _pp->sched = NULL;
-
-   if ( roar_dl_ra_init(g_plugins[i].lhandle, NULL, NULL) == -1 ) {
-    ROAR_WARN("plugins_init(void): Can not RA init lib at %p: %s", g_plugins[i].lhandle, roar_error2str(roar_error));
-    plugins_delete(&(g_plugins[i]));
-    continue;
-   }
-
-   if ( g_plugins[i].sched != NULL ) {
-    if ( g_plugins[i].sched->init != NULL ) {
-     roar_dl_context_restore(g_plugins[i].lhandle);
-     g_plugins[i].sched->init();
-     roar_dl_context_store(g_plugins[i].lhandle);
-    }
-   }
-
-   roar_dl_appsched_trigger(g_plugins[i].lhandle, ROAR_DL_APPSCHED_INIT);
-
-   _pp = NULL;
-  }
- }
+   plugins_init_one(&(g_plugins[i]));
+  }
+ }
+
+ _plugins_inited = 1;
 
  return 0;
@@ -169 +186 @@
  }
 
+ if ( _plugins_inited )
+  return plugins_init_one(next);
+
  return 0;
 }