Changeset 4330:dd9f4f56970f in roaraudio

Timestamp:

09/09/10 22:24:56 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected check, also added support for ROAR_OT_MIXER and ROAR_OT_BRIDGE

File:

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

roard/req.c

@@ -1003 +1003 @@
 
 int req_on_kick (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+ struct roar_stream_server * ss;
  uint16_t * info = (uint16_t *) mes->data;
  int is_stream = 0;
@@ -1025 +1026 @@
    break;
   case ROAR_OT_OUTPUT:
-    if ( streams_get_flag(info[1], ROAR_FLAG_OUTPUT) != 1 )
-     return -1;
+    if ( streams_get(info[1], &ss) == -1 )
+     return -1;
+
+    if ( ss->driver_id == -1 )
+     return -1;
+
+    is_stream = 1;
+   break;
+  case ROAR_OT_MIXER:
+    if ( streams_get(info[1], &ss) == -1 )
+     return -1;
+
+    if ( ROAR_STREAM(ss)->dir != ROAR_DIR_MIXING )
+     return -1;
+
+    is_stream = 1;
+   break;
+  case ROAR_OT_BRIDGE:
+    if ( streams_get(info[1], &ss) == -1 )
+     return -1;
+
+    if ( ROAR_STREAM(ss)->dir != ROAR_DIR_BRIDGE )
+     return -1;
+
     is_stream = 1;
    break;
@@ -1032 +1055 @@
 /* TODO: those types should be handled, too:
 #define ROAR_OT_SAMPLE    4
-#define ROAR_OT_MIXER     6
-#define ROAR_OT_BRIDGE    7
 #define ROAR_OT_LISTEN    8
 #define ROAR_OT_ACTION    9