Changeset 826:bab1cca7d75f in roaraudio

Timestamp:

09/22/08 21:01:59 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added experimental support for bidirectional streams

Files:

• include/libroar/stream.h (modified) (1 diff)
• include/roaraudio/stream.h (modified) (1 diff)
• roarclients/Makefile (modified) (2 diffs)
• roarclients/roarbidir.c (added)
• roard/streams.c (modified) (3 diffs)

include/libroar/stream.h

@@ -40 +40 @@
 #define roar_dir2str(x)   ((x) == ROAR_DIR_PLAY   ? "play"   : (x) == ROAR_DIR_MONITOR ? "monitor" : \
                            (x) == ROAR_DIR_FILTER ? "filter" : (x) == ROAR_DIR_RECORD  ? "record"  : \
-                           (x) == ROAR_DIR_OUTPUT ? "output" : "unknown")
+                           (x) == ROAR_DIR_OUTPUT ? "output" : (x) == ROAR_DIR_BIDIR   ? "bidir"   : \
+                           "unknown")
 /*
 #define roar_codec2str(x) ((x) == ROAR_CODEC_PCM_S_LE  ? "pcm_s_le"  : (x) == ROAR_CODEC_PCM_S_BE  ? "pcm_s_be"  : \

include/roaraudio/stream.h

@@ -42 +42 @@
 
 #define ROAR_DIR_META     8
+#define ROAR_DIR_BIDIR    9
 
 

roarclients/Makefile

@@ -1 @@
-TARGETS=roarcat roarcatad roarcat2sock roarcatsendfile roarcatplay roarcatpassfh roarctl roarmon roarsockconnect roartypes roarvorbis roarvumeter roarfilt roarsin roar-config polytest roarsocktypes roarshout roarradio
+TARGETS=roarcat roarcatad roarcat2sock roarcatsendfile roarcatplay roarcatpassfh roarbidir roarctl roarmon roarsockconnect roartypes roarvorbis roarvumeter roarfilt roarsin roar-config polytest roarsocktypes roarshout roarradio
 
 include ../Makefile.conf
@@ -23 +23 @@
 roarctl: roarctl.o
 roarmon: roarmon.o
+roarbidir: roarbidir.o
 roarfilt: roarfilt.o
         ${CC} ${LDFLAGS} -o roarfilt roarfilt.o -lm -lroardsp

roard/streams.c

@@ -498 +498 @@
  for (i = 0; i < ROAR_STREAMS_MAX; i++) {
   if ( g_streams[i] != NULL ) {
-   if ( ROAR_STREAM(g_streams[i])->dir != ROAR_DIR_PLAY )
+   if ( ROAR_STREAM(g_streams[i])->dir != ROAR_DIR_PLAY && ROAR_STREAM(g_streams[i])->dir != ROAR_DIR_BIDIR )
     continue;
 
@@ -600 +600 @@
   return 0;
 
- if ( s->dir != ROAR_DIR_PLAY )
+ if ( s->dir != ROAR_DIR_PLAY && s->dir != ROAR_DIR_BIDIR )
   return 0;
 
@@ -686 +686 @@
   return 0;
 
- if ( s->dir != ROAR_DIR_MONITOR && s->dir != ROAR_DIR_OUTPUT )
+ if ( s->dir != ROAR_DIR_MONITOR && s->dir != ROAR_DIR_OUTPUT && s->dir != ROAR_DIR_BIDIR )
   return 0;