Changeset 4552:47a0412f706d in roaraudio for roard/req.c

Timestamp:

10/25/10 14:03:43 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

implemented flag toggling and flag protection

File:

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

roard/req.c

@@ -1073 +1073 @@
 
 int req_on_set_stream_para (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+ struct roar_stream_server * ss;
  uint16_t * d = (uint16_t *) mes->data;
- uint32_t tmp;
+ uint32_t tmp, tmp2, flagstore;
+ int protect = 0;
  int i;
 
@@ -1107 +1109 @@
     tmp |= d[3];
 
-    if ( d[2] == ROAR_RESET_FLAG ) {
-     if ( streams_reset_flag(mes->stream, tmp) == -1 )
-      return -1;
-    } else {
-     if ( streams_set_flag(mes->stream, tmp) == -1 )
-      return -1;
-    }
+    if ( d[2] & ROAR_PROTECT_FLAG ) {
+     protect = 1;
+     d[2] -= ROAR_PROTECT_FLAG;
+    }
+
+    switch (d[2]) {
+     case ROAR_SET_FLAG:
+       if ( streams_set_flag(mes->stream, tmp) == -1 )
+        return -1;
+      break;
+     case ROAR_RESET_FLAG:
+       if ( streams_reset_flag(mes->stream, tmp) == -1 )
+        return -1;
+      break;
+     case ROAR_NOOP_FLAG:
+      break;
+     case ROAR_TOGGLE_FLAG:
+       if ( streams_get(mes->stream, &ss) == -1 )
+        return -1;
+
+       flagstore = ss->flags;
+
+       tmp2 = flagstore & tmp; // those are the flags we need to reset.
+       ROAR_DBG("req_on_set_stream_para(*): tmp2=0x%.8lx", (long int)tmp2);
+       if ( tmp2 )
+        if ( streams_reset_flag(mes->stream, tmp2) == -1 )
+         return -1;
+
+       tmp2 = (flagstore ^ tmp) & tmp; // those are the flags we need to set.
+       ROAR_DBG("req_on_set_stream_para(*): tmp2=0x%.8lx", (long int)tmp2);
+       if ( tmp2 )
+        if ( streams_set_flag(mes->stream, tmp2) == -1 )
+         return -1;
+      break;
+     default:
+       return -1;
+      break;
+    }
+
+   ROAR_DBG("req_on_set_stream_para(*): protect=%i", protect);
+   if ( protect )
+    if ( streams_protect_flag(mes->stream, tmp) == -1 )
+     return -1;
+
    break;
   case ROAR_STREAM_PARA_CHANMAP: