Changeset 5276:0eb24ca6810e in roaraudio for libroar/vio_cmd.c

Timestamp:

11/20/11 18:36:49 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

merged VIO's _nonblock() into _ctl() (Closes: #135)

File:

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

libroar/vio_cmd.c

@@ -80 +80 @@
  calls->read     = roar_vio_cmd_read;
  calls->write    = roar_vio_cmd_write;
- calls->nonblock = roar_vio_cmd_nonblock;
  calls->sync     = roar_vio_cmd_sync;
  calls->ctl      = roar_vio_cmd_ctl;
@@ -514 +513 @@
 }
 
-int     roar_vio_cmd_nonblock(struct roar_vio_calls * vio, int state) {
- struct roar_vio_cmd_state * self = (struct roar_vio_cmd_state *)vio->inst;
-
- self->options |= ROAR_VIO_CMD_OPTS_NONBLOCK;
-
- if ( state == ROAR_SOCKET_BLOCK )
-  self->options -= ROAR_VIO_CMD_OPTS_NONBLOCK;
-
- _LIBROAR_IGNORE_RET(roar_vio_nonblock(self->next, state)); // this should help, but may not nessessery.
-
- return 0;
-}
-
 int     roar_vio_cmd_sync    (struct roar_vio_calls * vio) {
  struct roar_vio_cmd_state * state = (struct roar_vio_cmd_state *)vio->inst;
+ int newblock = ROAR_SOCKET_BLOCK;
  int oldblock;
  int ret = 0;
@@ -534 +521 @@
  oldblock = state->options & ROAR_VIO_CMD_OPTS_NONBLOCK ? ROAR_SOCKET_NONBLOCK : ROAR_SOCKET_BLOCK;
 
- if ( roar_vio_cmd_nonblock(vio, ROAR_SOCKET_BLOCK) == -1 )
+ if ( roar_vio_cmd_ctl(vio, ROAR_VIO_CTL_NONBLOCK, &newblock) == -1 )
   return -1;
 
@@ -543 +530 @@
   ret = -1;
 
- if ( roar_vio_cmd_nonblock(vio, oldblock) == -1 )
+ if ( roar_vio_cmd_ctl(vio, ROAR_VIO_CTL_NONBLOCK, &oldblock) == -1 )
   return -1;
 
@@ -586 +573 @@
     return -1;
    break;
+  case ROAR_VIO_CTL_NONBLOCK:
+    state->options |= ROAR_VIO_CMD_OPTS_NONBLOCK;
+
+    if ( *(int*)data == ROAR_SOCKET_BLOCK )
+     state->options -= ROAR_VIO_CMD_OPTS_NONBLOCK;
+
+    _LIBROAR_IGNORE_RET(roar_vio_ctl(state->next, cmd, data)); // this should help, but may not necessarily.
+   break;
   default:
     return -1;