Changeset 3292:af91815a4426 in roaraudio

Timestamp:

02/01/10 20:36:09 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

pass opts of last dstr to roar_vio_open_default()

Files:

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

include/libroar/vio_dstr.h

@@ -168 +168 @@
 int     roar_vio_dstr_init_defaults_c (struct roar_vio_defaults * def, int type, struct roar_vio_defaults * odef, int o_flags);
 
-int     roar_vio_open_default (struct roar_vio_calls * calls, struct roar_vio_defaults * def);
+int     roar_vio_open_default (struct roar_vio_calls * calls, struct roar_vio_defaults * def, char * opts);
 
 int     roar_vio_open_dstr    (struct roar_vio_calls * calls, char * dstr, struct roar_vio_defaults * def, int dnum);

libroar/vio_dstr.c

@@ -190 +190 @@
 
 #ifndef ROAR_WITHOUT_VIO_DSTR
-int     roar_vio_open_default (struct roar_vio_calls * calls, struct roar_vio_defaults * def) {
+int     roar_vio_open_default (struct roar_vio_calls * calls, struct roar_vio_defaults * def, char * opts) {
+ ROAR_DBG("roar_vio_open_default(calls=%p, def=%p, opts='%s') = ?", calls, def, opts);
+
  if ( calls == NULL || def == NULL )
   return -1;
@@ -630 +632 @@
   }
 
-  if ( roar_vio_open_default(tc, def) == -1 ) {
+  if ( chain->opts == NULL ) {
+   if ( chain[1].type != ROAR_VIO_DSTR_OBJT_EOL ) {
+    chain->opts = chain[1].opts;
+   }
+  }
+
+  if ( roar_vio_open_default(tc, def, chain->opts) == -1 ) {
    _ret(-1);
   }