Changeset 2697:4a6231807551 in roaraudio

Timestamp:

09/13/09 13:18:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added parameter dir to roar_simple_connect_virtual()

Files:

• include/libroar/simple.h (modified) (1 diff)
• libroar/simple.c (modified) (1 diff)

include/libroar/simple.h

@@ -56 +56 @@
 int roar_simple_filter  (int rate, int channels, int bits, int codec, char * server, char * name);
 
-int roar_simple_connect_virtual(struct roar_connection * con, struct roar_stream * s, int parent);
+int roar_simple_connect_virtual(struct roar_connection * con, struct roar_stream * s, int parent, int dir);
 
 int roar_simple_close(int fh);

libroar/simple.c

@@ -348 +348 @@
 }
 
-int roar_simple_connect_virtual(struct roar_connection * con, struct roar_stream * s, int parent) {
+int roar_simple_connect_virtual(struct roar_connection * con, struct roar_stream * s, int parent, int dir) {
  struct roar_stream parent_stream;
- int dir;
 
  if ( con == NULL || s == NULL || parent < 0 )
   return -1;
 
- if ( roar_get_stream(con, &parent_stream, parent) == -1 )
-  return -1;
-
- if ( (dir = roar_stream_get_dir(&parent_stream)) == -1 )
-  return -1;
+ if ( dir == -1 ) {
+  if ( roar_get_stream(con, &parent_stream, parent) == -1 )
+   return -1;
+
+  if ( (dir = roar_stream_get_dir(&parent_stream)) == -1 )
+   return -1;
+ }
 
  if ( roar_stream_set_rel_id(s, parent) == -1 )