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

libroar/vio_buffer.c

@@ -63 +63 @@
  calls->close    = roar_vio_buffer_close;
  calls->write    = roar_vio_buffer_write;
- calls->nonblock = roar_vio_buffer_nonblock;
  calls->ctl      = roar_vio_buffer_ctl;
  calls->sync     = roar_vio_buffer_sync;
@@ -327 +326 @@
     return 0;
    break;
+  case ROAR_VIO_CTL_NONBLOCK:
+    if ( self->use_re ) {
+     return roar_vio_ctl(&(self->re_vio), ROAR_VIO_CTL_NONBLOCK, data);
+    } else {
+     return roar_vio_ctl(self->backend, ROAR_VIO_CTL_NONBLOCK, data);
+    }
+   break;
  }
 
@@ -342 +348 @@
 }
 
-int     roar_vio_buffer_nonblock(struct roar_vio_calls * vio, int state) {
- struct roar_vio_buffer * self = vio->inst;
-
- if ( self->use_re ) {
-  return roar_vio_nonblock(&(self->re_vio), state);
- } else {
-  return roar_vio_nonblock(self->backend, state);
- }
-}
-
 //ll