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

libroar/vio_stream.c

@@ -47 +47 @@
  return roar_vio_lseek(roar_get_connection_vio2(vio->inst), offset, whence);
 }
-static int     _vio_stream_nonblock(struct roar_vio_calls * vio, int state) {
- return roar_vio_nonblock(roar_get_connection_vio2(vio->inst), state);
-}
 static int     _vio_stream_sync    (struct roar_vio_calls * vio) {
  return roar_vio_sync(roar_get_connection_vio2(vio->inst));
@@ -81 +78 @@
     roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
+   break;
+  case ROAR_VIO_CTL_NONBLOCK:
+    return roar_vio_ctl(roar_get_connection_vio2(vio->inst), ROAR_VIO_CTL_NONBLOCK, data);
    break;
  }
@@ -143 +143 @@
  calls->write      = _vio_stream_write;
  calls->lseek      = _vio_stream_lseek;
- calls->nonblock   = _vio_stream_nonblock;
  calls->sync       = _vio_stream_sync;
  calls->ctl        = _vio_stream_ctl;