Changeset 5073:f9b421aec994 in roaraudio for libroar

Timestamp:

06/19/11 22:21:38 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added code to handle responses to async messages, still need code to send them

File:

• libroar/vs.c (modified) (5 diffs)

libroar/vs.c

@@ -41 +41 @@
 
 #define LOCAL_CLOCK    ROAR_CLOCK_DEFAULT
+#define ASYNC_QLEN     4
 
 #define FLAG_NONE      0x0000
@@ -49 +50 @@
 #define FLAG_FREE_VOL  0x0010
 #define FLAG_DEF_PAUSE 0x0020
+#define FLAG_ASYNC     0x0040
 #define FLAG_DIR_IN    0x1000
 #define FLAG_DIR_OUT   0x2000
@@ -87 +89 @@
  } latmes;
  struct {
+  size_t lock;
   size_t qlen;
+  int qcmd[ASYNC_QLEN];
+  int qsubcmd[ASYNC_QLEN];
  } async;
 };
@@ -94 +99 @@
 
 static int _handle_async_req(roar_vs_t * vss, int * error) {
+ struct roar_message mes;
+ char * data = NULL;
+ uint16_t * ud16 = (uint16_t *) mes.data;
+ ssize_t offset;
+ int cmd, subcmd;
+ int i;
+
+ if ( roar_recv_message(vss->con, &mes, &data) == -1 ) {
+  _seterrre();
+ }
+
+ cmd    = vss->async.qcmd[0];
+ subcmd = vss->async.qsubcmd[0];
+ vss->async.qlen--;
+
+ for (i = 1; i < ASYNC_QLEN; i++) {
+  vss->async.qcmd[i-1]    = vss->async.qcmd[i];
+  vss->async.qsubcmd[i-1] = vss->async.qsubcmd[i];
+ }
+
+ if ( mes.cmd == ROAR_CMD_OK ) {
+  switch (cmd) {
+   case ROAR_CMD_GET_STREAM_PARA:
+     if ( subcmd == ROAR_STREAM_PARA_INFO ) {
+      if ( mes.datalen >= 16 ) {
+       for (i = 0; i < mes.datalen/2; i++) {
+        ud16[i] = ROAR_HOST2NET16(ud16[i]);
+       }
+       if ( ud16[0] == 0 || ud16[1] == 1 ) {
+        offset  = ud16[7];
+        offset *= 1000;
+        offset *= vss->info.rate;
+        offset /= 1000000;
+        vss->latmes.last_offset = offset;
+       }
+      }
+     } else {
+      ROAR_WARN("_handle_async_req(vss=%p, error=%p): Got unexpected reply for command GET_STREAM_PARA, subcommand", vss, error, subcmd);
+     }
+    break;
+   case ROAR_CMD_GET_STREAM:
+     vss->latmes.last_offset = mes.pos; // ha, this is a easy one ;)
+    break;
+   default:
+     ROAR_WARN("_handle_async_req(vss=%p, error=%p): Got unexpected reply for command %i", vss, error, cmd);
+    break;
+  }
+ }
+
+ if ( data != NULL )
+  free(data);
+
  _seterr(ROAR_ERROR_NOSYS);
  return -1;
@@ -1193 +1250 @@
    }
   } else if ( vios[i].ud.vp == vss->con ) {
-   roar_sync(vss->con);
+   if ( vss->async.qlen ) {
+    _handle_async_req(vss, NULL);
+   } else {
+    roar_sync(vss->con);
+   }
   } else if ( vss->file != NULL && vios[i].ud.vp == vss->file ) {
    if ( vios[i].eventsa & ROAR_VIO_SELECT_READ )