Changeset 3313:24bb2b78bb91 in roaraudio

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

support registered dstr types

File:

• libroar/vio_dstr.c (modified) (4 diffs)

libroar/vio_dstr.c

@@ -462 +462 @@
 
 int     roar_vio_dstr_set_defaults(struct roar_vio_dstr_chain * chain, int len, struct roar_vio_defaults * def, int dnum) {
+ struct _roar_vio_dstr_type * type;
  struct roar_vio_dstr_chain * c, * next;
  int i;
@@ -684 +685 @@
     break;
    default:
-    // TODO: FIXME: add code to use functions from type struct
-    _roar_vio_dstr_init_otherlibs();
-    return -1;
+     if ( (type = roar_vio_dstr_get_by_type(c->type)) == NULL ) {
+      return -1;
+     }
+
+     if ( type->setdef == NULL )
+      _roar_vio_dstr_init_otherlibs();
+
+     if ( type->setdef == NULL ) {
+      return -1;
+     }
+
+     if ( type->setdef(c, next) == -1 ) {
+      return -1;
+     }
   }
 
@@ -713 +725 @@
 int     roar_vio_dstr_build_chain(struct roar_vio_dstr_chain * chain, struct roar_vio_calls * calls,
                                   struct roar_vio_calls * vio) {
+ struct _roar_vio_dstr_type * type;
  struct roar_vio_dstr_chain * c;
  struct roar_vio_defaults   * def;
@@ -840 +853 @@
      break;
     default:
-      // TODO: FIXME: add code to use functions from type struct
-      _roar_vio_dstr_init_otherlibs();
-      _ret(-1);
+      if ( (type = roar_vio_dstr_get_by_type(c->type)) == NULL ) {
+       _ret(-1);
+      }
+
+      if ( type->openvio == NULL )
+       _roar_vio_dstr_init_otherlibs();
+
+      if ( type->openvio == NULL ) {
+       _ret(-1);
+      }
+
+      if ( type->openvio(tc, prev, c) == -1 ) {
+       _ret(-1);
+      }
    }