Changeset 3542:4a10d68e4c70 in roaraudio for roard/streams.c

Timestamp:

02/20/10 01:28:43 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support to set channel map

File:

• roard/streams.c (modified) (3 diffs)

roard/streams.c

@@ -318 +318 @@
      roardsp_chanlist_init(ss->chanmap.in,  ROAR_STREAM(ss)->info.channels, ROARDSP_CHANLIST_MAP_ROARAUDIO);
      roardsp_chanlist_init(ss->chanmap.out, ROAR_STREAM(ss)->info.channels, ROARDSP_CHANLIST_MAP_ROARAUDIO);
-     roardsp_chanmap_calc(&(ss->chanmap), ROARDSP_CHANMAP_MAP, 0);
+     roardsp_chanmap_calc(&(ss->chanmap), ROARDSP_CHANMAP_MAP, 0); // MAP and INVMAP are the same when in==out
     break;
 #ifndef ROAR_WITHOUT_DCOMP_MIDI
@@ -415 +415 @@
 }
 
+int streams_get_ssdir  (int id) {
+ struct roar_stream_server * ss;
+
+ _CHECK_SID(id);
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ switch (ROAR_STREAM(ss)->dir) {
+  case ROAR_DIR_PLAY:
+  case ROAR_DIR_MIDI_IN:
+  case ROAR_DIR_LIGHT_IN:
+  case ROAR_DIR_RAW_IN:
+  case ROAR_DIR_COMPLEX_IN:
+    return STREAM_DIR_IN;
+   break;
+  case ROAR_DIR_RECORD:
+  case ROAR_DIR_MONITOR:
+  case ROAR_DIR_OUTPUT:
+  case ROAR_DIR_MIDI_OUT:
+  case ROAR_DIR_LIGHT_OUT:
+  case ROAR_DIR_RAW_OUT:
+  case ROAR_DIR_COMPLEX_OUT:
+    return STREAM_DIR_OUT;
+   break;
+  case ROAR_DIR_MIXING:
+    return STREAM_DIR_NONE;
+   break;
+  case ROAR_DIR_FILTER:
+  case ROAR_DIR_BIDIR:
+    return STREAM_DIR_BIDIR;
+   break;
+  case ROAR_DIR_THRU:
+    return streams_get_ssdir(ROAR_STREAM(ss)->pos_rel_id);
+   break;
+ }
+
+ return -1;
+}
+
 #define _err() streams_delete(id); return -1;
 int streams_new_virtual (int parent, struct roar_stream_server ** stream) {
@@ -895 +935 @@
 
  return driver_set_volume(id, &(ss->mixer));
+}
+
+int streams_set_map      (int id, char * map, size_t len) {
+ struct roar_stream_server * ss;
+ int ssdir;
+
+ _CHECK_SID(id);
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ ssdir = streams_get_ssdir(id);
+ if ( ssdir != STREAM_DIR_IN && ssdir != STREAM_DIR_OUT )
+  return -1;
+
+ if ( map != NULL ) {
+  if ( ROAR_STREAM(ss)->info.channels != len )
+   return -1;
+
+  memcpy(ss->chanmap.in, map, len);
+ }
+
+ switch (ssdir) {
+  case STREAM_DIR_IN:
+    roardsp_chanmap_calc(&(ss->chanmap), ROARDSP_CHANMAP_MAP, 0);
+   break;
+  case STREAM_DIR_OUT:
+    roardsp_chanmap_calc(&(ss->chanmap), ROARDSP_CHANMAP_INVMAP, 0);
+   break;
+ }
+
+ return 0;
 }