Changeset 1919:ab6c76b94351 in roaraudio

Timestamp:

05/27/09 17:36:27 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make it possible to set subsystem (dir)

File:

• roard/roard.c (modified) (4 diffs)

roard/roard.c

@@ -158 +158 @@
  int sync = 0;
  int32_t blocks = -1, blocksize = -1;
+ int dir = OAR_DIR_OUTPUT;
 
  ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = ?", drv, dev, opts);
@@ -189 +190 @@
  memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info));
 
- if ( streams_set_dir(stream, ROAR_DIR_OUTPUT, 1) == -1 ) {
-  streams_delete(stream);
-  return -1;
- }
  s->pos_rel_id = -1;
 // s->info.codec = codec;
@@ -228 +225 @@
   } else if ( strcmp(k, "blocksize") == 0 ) {
    blocksize = atoi(v);
+  } else if ( strcmp(k, "subsystem") == 0 ) {
+   if ( !strcasecmp(v, "wave") || !strcasecmp(v, "waveform") ) {
+    dir = OAR_DIR_OUTPUT;
+   } else if ( !strcasecmp(v, "midi") ) {
+    dir = ROAR_DIR_MIDI_OUT;
+   } else if ( !strcasecmp(v, "light") ) {
+    dir = ROAR_DIR_LIGHT_OUT;
+   } else {
+    ROAR_ERR("add_output(*): unknown subsystem '%s'", k);
+    streams_delete(stream);
+    if ( prim ) alive = 0;
+#ifdef ROAR_DRIVER_CODEC
+    if ( to_free != NULL )
+     free(to_free);
+#endif
+    return -1; 
+   }
   } else if ( strcmp(k, "meta") == 0 ) {
    streams_set_flag(stream, ROAR_FLAG_META);
@@ -251 +265 @@
 
   k = strtok(NULL, ",");
+ }
+
+ if ( streams_set_dir(stream, dir, 1) == -1 ) {
+  streams_delete(stream);
+  return -1;
  }