Changeset 3312:f425c2ff782d in roaraudio

Timestamp:

02/03/10 14:03:41 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

more general internal API, support to register types

Files:

• include/libroar/vio_dstr.h (modified) (1 diff)
• libroar/vio_dstr.c (modified) (3 diffs)

include/libroar/vio_dstr.h

@@ -174 +174 @@
 char *  roar_vio_dstr_get_name(int type);
 
+int     roar_vio_dstr_register_type(int   type,
+                                    char *name,
+                                    int (*setdef) (struct roar_vio_dstr_chain * cur,
+                                                   struct roar_vio_dstr_chain * next),
+                                    int (*openvio)(struct roar_vio_calls      * calls,
+                                                   struct roar_vio_calls      * dst,
+                                                   struct roar_vio_dstr_chain * cur));
+
 int     roar_vio_dstr_init_defaults (struct roar_vio_defaults * def, int type, int o_flags, mode_t o_mode);
 int     roar_vio_dstr_init_defaults_c (struct roar_vio_defaults * def, int type, struct roar_vio_defaults * odef, int o_flags);

libroar/vio_dstr.c

@@ -36 +36 @@
 
 #ifndef ROAR_WITHOUT_VIO_DSTR
-struct {
+struct _roar_vio_dstr_type {
  int    id;
  char * name;
@@ -212 +212 @@
 }
 
-char *  roar_vio_dstr_get_name(int type) {
+struct _roar_vio_dstr_type * roar_vio_dstr_get_by_type (int type) {
  int i;
 
  for (i = 0; _roar_vio_dstr_objs[i].id != ROAR_VIO_DSTR_OBJT_EOL; i++) {
   if ( _roar_vio_dstr_objs[i].id == type )
-   return _roar_vio_dstr_objs[i].name;
- }
+   return &(_roar_vio_dstr_objs[i]);
+ }
+
+ return NULL;
+}
+
+char *  roar_vio_dstr_get_name(int type) {
+ struct _roar_vio_dstr_type * ret;
+
+ if ( (ret = roar_vio_dstr_get_by_type(type)) != NULL )
+  return ret->name;
 
  if ( type == ROAR_VIO_DSTR_OBJT_EOL )
@@ -224 +233 @@
 
  return NULL;
+}
+
+int     roar_vio_dstr_register_type(int   type,
+                                    char *name,
+                                    int (*setdef) (struct roar_vio_dstr_chain * cur,
+                                                   struct roar_vio_dstr_chain * next),
+                                    int (*openvio)(struct roar_vio_calls      * calls,
+                                                   struct roar_vio_calls      * dst,
+                                                   struct roar_vio_dstr_chain * cur)) {
+ struct _roar_vio_dstr_type * ret;
+
+ if ( (ret = roar_vio_dstr_get_by_type(type)) == NULL ) /* we can currently not register new types */
+  return -1;
+
+
+ // check if things are allready set, we do not want to allow overwrite here.
+ if ( setdef != NULL && ret->setdef != NULL )
+  return -1;
+
+ if ( openvio != NULL && ret->openvio != NULL )
+  return -1;
+
+ if ( setdef != NULL )
+  ret->setdef = setdef;
+
+ if ( openvio != NULL )
+  ret->openvio = openvio;
+
+ return 0;
 }