Changeset 5312:27ec111dc8c5 in roaraudio for roard/plugins.c

Timestamp:

11/30/11 01:05:41 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for seperate contextes for roardl/plugins. Currently incudes error state and a global per handle data segment. This does not work for statically linked librarys (yet). support for per-context notify core needs to be added/completed.

File:

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

roard/plugins.c

@@ -57 +57 @@
  int i;
 
- if ( plugin->sched != NULL )
-  if ( plugin->sched->free != NULL )
+ if ( plugin->sched != NULL ) {
+  if ( plugin->sched->free != NULL ) {
+   roar_dl_context_restore(plugin->lhandle);
    plugin->sched->free();
+   roar_dl_context_store(plugin->lhandle);
+  }
+ }
 
  for (i = 0; i < MAX_PROTOS; i++) {
@@ -87 +91 @@
    }
 
-   if ( g_plugins[i].sched != NULL )
-    if ( g_plugins[i].sched->init != NULL )
+   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);
+    }
+   }
 
    _pp = NULL;
@@ -114 +122 @@
  int i;
 
- for (i = 0; i < MAX_PLUGINS; i++)
-  if ( g_plugins[i].lhandle != NULL )
-   if ( g_plugins[i].sched != NULL )
-    if ( g_plugins[i].sched->update != NULL )
+ for (i = 0; i < MAX_PLUGINS; i++) {
+  if ( g_plugins[i].lhandle != NULL ) {
+   if ( g_plugins[i].sched != NULL ) {
+    if ( g_plugins[i].sched->update != NULL ) {
+     roar_dl_context_restore(g_plugins[i].lhandle);
      if ( g_plugins[i].sched->update() == -1 )
       ret = -1;
+     roar_dl_context_store(g_plugins[i].lhandle);
+    }
+   }
+  }
+ }
 
  return ret;
@@ -178 +192 @@
  }
 
- return clients_register_proto(proto);
+ return clients_register_proto(proto, _pp->lhandle);
 }