Changeset 5276:0eb24ca6810e in roaraudio for libroar/vio_misc.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_misc.c (modified) (3 diffs)

libroar/vio_misc.c

@@ -59 +59 @@
 }
 
-static int     roar_vio_misc_nonblock(struct roar_vio_calls * vio, int state) {
- struct roar_vio_misc * self = vio->inst;
-
- if ( self->support_nonblocking )
-  return 0;
-
- if ( state == ROAR_SOCKET_BLOCK )
-  return 0;
-
- return -1;
-}
-
 static int     roar_vio_misc_sync    (struct roar_vio_calls * vio) {
  (void)vio;
@@ -94 +82 @@
     return 0;
    break;
+  case ROAR_VIO_CTL_NONBLOCK:
+    if ( self->support_nonblocking )
+     return 0;
+
+    if ( *(int*)data == ROAR_SOCKET_BLOCK )
+     return 0;
+
+    return -1;
+   break; 
  }
 
@@ -112 +109 @@
  calls->write    = roar_vio_misc_write;
  calls->lseek    = roar_vio_misc_lseek;
- calls->nonblock = roar_vio_misc_nonblock;
  calls->sync     = roar_vio_misc_sync;
  calls->ctl      = roar_vio_misc_ctl;