Changeset 1505:06a3687a4ce8 in roaraudio

Timestamp:

04/01/09 17:55:36 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added more support for vio_ctl, added ROAR_VIO_CTL_GET_*FH and ROAR_VIO_CTL_SELECT

Files:

• include/libroar/vio.h (modified) (3 diffs)
• include/libroar/vio_pipe.h (modified) (1 diff)
• include/libroar/vio_stack.h (modified) (1 diff)
• libroar/vio.c (modified) (4 diffs)
• libroar/vio_pipe.c (modified) (1 diff)
• libroar/vio_stack.c (modified) (2 diffs)

include/libroar/vio.h

@@ -49 +49 @@
  *   0x1XXX -> Server 
  */
+
+// basic calls:
+#define ROAR_VIO_CTL_GET_NEXT          0x0101
+#define ROAR_VIO_CTL_SET_NEXT          0x0102
+#define ROAR_VIO_CTL_GET_FH            0x0110
+#define ROAR_VIO_CTL_GET_READ_FH       0x0111
+#define ROAR_VIO_CTL_GET_WRITE_FH      0x0112
+#define ROAR_VIO_CTL_SELECT            0x0120
+
 // stream:
 #define ROAR_VIO_CTL_SET_STREAM    0x00010001 /* normal streams */
@@ -140 +149 @@
 int     roar_vio_basic_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_basic_sync    (struct roar_vio_calls * vio);
+int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
 int     roar_vio_basic_close   (struct roar_vio_calls * vio);
 
@@ -169 +179 @@
 off_t   roar_vio_stdio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
 int     roar_vio_stdio_sync    (struct roar_vio_calls * vio);
+int     roar_vio_stdio_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
 int     roar_vio_stdio_close   (struct roar_vio_calls * vio);
 

include/libroar/vio_pipe.h

@@ -68 +68 @@
 int     roar_vio_pipe_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_pipe_sync    (struct roar_vio_calls * vio);
+int     roar_vio_pipe_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
 int     roar_vio_pipe_close   (struct roar_vio_calls * vio);
 

include/libroar/vio_stack.h

@@ -56 +56 @@
 int     roar_vio_stack_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_stack_sync    (struct roar_vio_calls * vio);
+int     roar_vio_stack_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
 int     roar_vio_stack_close   (struct roar_vio_calls * vio);
 

libroar/vio.c

@@ -57 +57 @@
  calls->nonblock = roar_vio_basic_nonblock;
  calls->sync     = roar_vio_basic_sync;
+ calls->ctl      = roar_vio_basic_ctl;
  calls->close    = roar_vio_basic_close;
 
@@ -380 +381 @@
  return 0;
 #endif
+}
+
+int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+
+ if ( vio == NULL || cmd == -1 )
+  return -1;
+
+ switch (cmd) {
+  case ROAR_VIO_CTL_GET_FH:
+  case ROAR_VIO_CTL_GET_READ_FH:
+  case ROAR_VIO_CTL_GET_WRITE_FH:
+    *(int*)data = roar_vio_get_fh(vio);
+    return 0;
+   break;
+ }
+
+ return -1;
 }
 
@@ -441 +459 @@
 
 int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+ if (vio == NULL || cmd == -1)
+  return -1;
+
+ switch (cmd) {
+  case ROAR_VIO_CTL_GET_NEXT:
+    *(struct roar_vio_calls **)data = vio->inst;
+    return 0;
+   break;
+  case ROAR_VIO_CTL_SET_NEXT:
+    vio->inst = *(struct roar_vio_calls **)data;
+    return 0;
+   break;
+ }
+
  return roar_vio_ctl((struct roar_vio_calls *) vio->inst, cmd, data);
 }
@@ -538 +570 @@
 }
 
+int     roar_vio_stdio_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+
+ if ( vio == NULL || cmd == -1 )
+  return -1;
+
+ switch (cmd) {
+  case ROAR_VIO_CTL_GET_FH:
+  case ROAR_VIO_CTL_GET_READ_FH:
+  case ROAR_VIO_CTL_GET_WRITE_FH:
+   *(int*)data = fileno((FILE*)(vio->inst));
+    return 0;
+   break;
+ }
+
+ return -1;
+}
+
 int     roar_vio_stdio_close   (struct roar_vio_calls * vio) {
  return fclose((FILE*)(vio->inst));

libroar/vio_pipe.c

@@ -211 +211 @@
 }
 
+int     roar_vio_pipe_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+ struct roar_vio_pipe * self;
+
+ if (vio == NULL || cmd == -1)
+  return -1;
+
+ if ( (self = (struct roar_vio_pipe *)vio->inst) == NULL )
+  return -1;
+
+ switch (cmd) {
+  case ROAR_VIO_CTL_GET_FH:
+    if ( self->type == ROAR_VIO_PIPE_TYPE_SOCKET ) {
+     *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)];
+     return 0;
+    } else {
+     return -1;
+    }
+   break;
+  case ROAR_VIO_CTL_GET_READ_FH:
+    switch (self->type) {
+     case ROAR_VIO_PIPE_TYPE_SOCKET:
+       *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)];
+       return 0;
+      break;
+     case ROAR_VIO_PIPE_TYPE_PIPE:
+       *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)*2];
+       return 0;
+      break;
+    }
+  case ROAR_VIO_CTL_GET_WRITE_FH:
+    switch (self->type) {
+     case ROAR_VIO_PIPE_TYPE_SOCKET:
+       *(int*)data = self->b.p[ROAR_VIO_PIPE_S(self,vio)];
+       return 0;
+      break;
+     case ROAR_VIO_PIPE_TYPE_PIPE:
+       *(int*)data = self->b.p[(ROAR_VIO_PIPE_SR(self,vio)*2)+1];
+       return 0;
+      break;
+    }
+   break;
+ }
+
+ return -1;
+}
+
+
 ssize_t roar_vio_pipe_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
  struct roar_vio_pipe * self;

libroar/vio_stack.c

@@ -49 +49 @@
  calls->inst     = self;
  calls->close    = roar_vio_stack_close;
+ calls->ctl      = roar_vio_stack_ctl;
  calls->read     = roar_vio_stack_read;
  calls->write    = roar_vio_stack_write;
@@ -97 +98 @@
  return 0;
 }
+
+int     roar_vio_stack_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+ if (vio == NULL || cmd == -1)
+  return -1;
+
+ switch (cmd) {
+  case ROAR_VIO_CTL_GET_FH:
+  case ROAR_VIO_CTL_GET_READ_FH:
+  case ROAR_VIO_CTL_GET_WRITE_FH:
+  case ROAR_VIO_CTL_SELECT:
+    return roar_vio_ctl(((struct roar_vio_stack*)(vio->inst))->cur, cmd, data);
+   break;
+ }
+
+ return -1;
+}
+
 
 ssize_t roar_vio_stack_read    (struct roar_vio_calls * vio, void *buf, size_t count) {