Changeset 5640:00dd1147ce70 in roaraudio for roard/plugins.c

Timestamp:

09/10/12 16:18:22 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed support for roard's proto support (replaced by CPI) (Closes: #278)

File:

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

roard/plugins.c

@@ -30 +30 @@
 static struct _roard_plugin {
  struct roar_dl_lhandle     * lhandle;
- int protocols[MAX_PROTOS];
 } g_plugins[MAX_PLUGINS];
 static struct _roard_plugin * _pp = NULL;
@@ -76 +75 @@
 
 static inline void plugins_delete(struct _roard_plugin * plugin) {
- int i;
-
  ROAR_DBG("plugins_delete(plugin=%p) = ?", plugin);
 
  roar_dl_appsched_trigger(plugin->lhandle, ROAR_DL_APPSCHED_FREE);
-
- for (i = 0; i < MAX_PROTOS; i++) {
-  if ( plugin->protocols[i] != -1 ) {
-   clients_unregister_proto(plugin->protocols[i]);
-  }
- }
 
  roar_dl_close(plugin->lhandle);
@@ -179 +170 @@
  struct _roard_plugin * next = _find_free();
  struct roar_dl_librarypara * para;
- int i;
 
  ROAR_DBG("plugins_load(filename=\"%s\", args=\"%s\") = ?", filename, args);
@@ -185 +175 @@
  if ( next == NULL )
   return -1;
-
- for (i = 0; i < MAX_PLUGINS; i++)
-  next->protocols[i] = -1;
 
  if ( (para = roar_dl_para_new(args, NULL, ROARD_DL_APPNAME, ROARD_DL_ABIVERSION)) == NULL ) {
@@ -244 +231 @@
 }
 
-int plugins_reg_proto(struct roard_proto         * proto) {
- int i;
-
- if ( _pp == NULL )
-  return -1;
-
- for (i = 0; i < MAX_PROTOS; i++) {
-  if ( _pp->protocols[i] == -1 ) {
-   _pp->protocols[i] = proto->proto;
-   break;
-  }
- }
-
- if ( i == MAX_PROTOS ) {
-  roar_err_set(ROAR_ERROR_NOMEM);
-  return -1;
- }
-
- return clients_register_proto(proto, _pp->lhandle);
-}
-
 static int plugin_callback(enum roar_dl_fnreg_action action, int fn, int subtype, const void * object, size_t objectlen, int version, int options, void * userdata, struct roar_dl_lhandle * lhandle) {