Changeset 3362:2bf10ee217b5 in roaraudio

Timestamp:

02/08/10 16:36:13 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support plugin sched events

Location:

roard

Files:

• include/plugins.h (modified) (1 diff)
• loop.c (modified) (1 diff)
• plugins.c (modified) (5 diffs)

roard/include/plugins.h

@@ -28 +28 @@
 #include <roaraudio.h>
 
+struct roard_plugins_sched {
+ int (*init)(void);
+ int (*free)(void);
+ int (*update)(void);
+};
+
 int plugins_preinit  (void);
 int plugins_init     (void);
 int plugins_free     (void);
+int plugins_update   (void);
 
 int plugins_load     (const char * filename);
+
+int plugins_reg_sched(struct roard_plugins_sched * sched);
 
 #endif

roard/loop.c

@@ -112 +112 @@
 */
 
+  if ( plugins_update() == -1 )
+   alive = 0;
 
   ROAR_DBG("main_loop(*): sending output data...");

roard/plugins.c

@@ -27 +27 @@
 #define MAX_PLUGINS    8
 
-static struct roar_dl_lhandle * g_plugins[MAX_PLUGINS];
+static struct _roard_plugin {
+ struct roar_dl_lhandle     * lhandle;
+ struct roard_plugins_sched * sched;
+} g_plugins[MAX_PLUGINS];
+static struct _roard_plugin * _pp = NULL;
 
-static struct roar_dl_lhandle ** _find_free(void) {
+static struct _roard_plugin * _find_free(void) {
  int i;
 
  for (i = 0; i < MAX_PLUGINS; i++) {
-  if ( g_plugins[i] == NULL )
+  if ( g_plugins[i].lhandle == NULL ) {
+   memset(&(g_plugins[i]), 0, sizeof(struct _roard_plugin));
    return &(g_plugins[i]);
+  }
  }
 
@@ -50 +56 @@
 
  for (i = 0; i < MAX_PLUGINS; i++) {
-  if ( g_plugins[i] != NULL ) {
-   roar_dl_ra_init(g_plugins[i], NULL);
+  if ( g_plugins[i].lhandle != NULL ) {
+   _pp = &(g_plugins[i]);
+
+   roar_dl_ra_init(g_plugins[i].lhandle, NULL);
+
+   if ( g_plugins[i].sched->init != NULL )
+    g_plugins[i].sched->init();
+
+   _pp = NULL;
   }
  }
@@ -62 +75 @@
 
  for (i = 0; i < MAX_PLUGINS; i++) {
-  if ( g_plugins[i] != NULL ) {
-   roar_dl_close(g_plugins[i]);
+  if ( g_plugins[i].lhandle != NULL ) {
+   if ( g_plugins[i].sched->free != NULL )
+    g_plugins[i].sched->free();
+
+   roar_dl_close(g_plugins[i].lhandle);
   }
  }
@@ -70 +86 @@
 }
 
+int plugins_update   (void) {
+ int ret = 0;
+ int i;
+
+ for (i = 0; i < MAX_PLUGINS; i++)
+  if ( g_plugins[i].lhandle != NULL )
+   if ( g_plugins[i].sched->update != NULL )
+    if ( g_plugins[i].sched->update() == -1 )
+     ret = -1;
+
+ return ret;
+}
+
 int plugins_load  (const char * filename) {
- struct roar_dl_lhandle ** next = _find_free();
+ struct _roard_plugin * next = _find_free();
 
  if ( next == NULL )
   return -1;
 
- *next = roar_dl_open(filename, -1, 0 /* we delay this until plugins_init() */);
- if ( *next == NULL )
+ next->lhandle = roar_dl_open(filename, -1, 0 /* we delay this until plugins_init() */);
+ if ( next->lhandle == NULL )
   return -1;
 
@@ -83 +112 @@
 }
 
+int plugins_reg_sched(struct roard_plugins_sched * sched) {
+ if ( _pp == NULL )
+  return -1;
+
+ _pp->sched = sched;
+
+ return 0;
+}
+
 //ll