Changeset 5639:b8cdcac37ffe in roaraudio for roard

Timestamp:

09/10/12 15:56:42 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed roard's sched support (Closes: #277)

Location:

roard

Files:

• include/plugins.h (modified) (3 diffs)
• plugins.c (modified) (7 diffs)

roard/include/plugins.h

@@ -32 +32 @@
 #define ROARD_DL_ABIVERSION "1.0beta1"
 
-struct roard_plugins_sched {
- int (*init)(void);
- int (*free)(void);
- int (*update)(void);
-};
-
 int plugins_preinit  (void);
 int plugins_init     (void);
@@ -47 +41 @@
 void print_pluginlist(enum output_format format);
 
-int plugins_reg_sched(struct roard_plugins_sched * sched);
 int plugins_reg_proto(struct roard_proto         * proto);
 
@@ -60 +53 @@
   return 0; \
  }
-
-#define ROARD_DL_REG_SCHED(sched) \
- ROARD_DL_REG__UNI_PRE(sched) \
-  for (i = 0; i < (sizeof((sched))/sizeof(*(sched))); i++) \
-   plugins_reg_sched(&((sched)[i])); \
- ROARD_DL_REG__UNI_POST
-
-// Register Scheduler callbacks:
-#define ROARD_DL_REGFN_SCHED() ROAR_DL_PLUGIN_REG(ROAR_DL_FN_ROARDSCHED, __reg_sched)
 
 #define ROARD_DL_REG_PROTO(proto) \

roard/plugins.c

@@ -30 +30 @@
 static struct _roard_plugin {
  struct roar_dl_lhandle     * lhandle;
- struct roard_plugins_sched * sched;
  int protocols[MAX_PROTOS];
 } g_plugins[MAX_PLUGINS];
@@ -81 +80 @@
  ROAR_DBG("plugins_delete(plugin=%p) = ?", plugin);
 
- if ( plugin->sched != NULL ) {
-  if ( plugin->sched->free != NULL ) {
-   roar_dl_context_restore(plugin->lhandle);
-   plugin->sched->free();
-   roar_dl_context_store(plugin->lhandle);
-  }
- }
-
  roar_dl_appsched_trigger(plugin->lhandle, ROAR_DL_APPSCHED_FREE);
 
@@ -109 +100 @@
 
  _pp = plugin;
- _pp->sched = NULL;
 
  if ( roar_dl_ra_init(plugin->lhandle, NULL, NULL) == -1 ) {
@@ -117 +107 @@
  }
 
- 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);
 
@@ -185 +167 @@
  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);
-    }
-   }
    if ( roar_dl_appsched_trigger(g_plugins[i].lhandle, ROAR_DL_APPSCHED_UPDATE) == -1 )
     if ( roar_error != ROAR_ERROR_NOENT )
@@ -261 +235 @@
   } else {
    printf("  %s\n", libname->libname);
-   printf("   Flags:       %s\n", p->sched != NULL ? "roardsched" : "");
+   printf("   Flags:       %s\n", "");
    if ( libname->description != NULL )
     printf("   Description: %s\n", libname->description);
@@ -268 +242 @@
   }
  }
-}
-
-int plugins_reg_sched(struct roard_plugins_sched * sched) {
- if ( _pp == NULL )
-  return -1;
-
- _pp->sched = sched;
-
- return 0;
 }