Changeset 5276:0eb24ca6810e in roaraudio for roard/driver_oss.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:

• roard/driver_oss.c (modified) (3 diffs)

roard/driver_oss.c

@@ -38 +38 @@
  vio->write    = driver_oss_write;
  vio->read     = driver_oss_read;
- vio->nonblock = driver_oss_nonblock;
  vio->sync     = driver_oss_sync;
  vio->ctl      = driver_oss_ctl;
@@ -448 +447 @@
 }
 
-int     driver_oss_nonblock(struct roar_vio_calls * vio, int state) {
- ROAR_DBG("driver_oss_nonblock(vio=%p, state=%i) = ?", vio, state);
-
- if ( roar_socket_nonblock(_get(vio,fh), state) == -1 ) {
-  ROAR_DBG("driver_oss_nonblock(vio=%p, state=%i) = -1", vio, state);
-  return -1;
- }
-
- if ( state == ROAR_SOCKET_NONBLOCK ) {
-  ROAR_DBG("driver_oss_nonblock(vio=%p, state=%i) = 0", vio, state);
-  return 0;
- }
-
- roar_vio_sync(vio);
-
- ROAR_DBG("driver_oss_nonblock(vio=%p, state=%i) = 0", vio, state);
-
- return 0;
-}
-
 int driver_oss_sync(struct roar_vio_calls * vio) {
 #ifdef SNDCTL_DSP_SYNC
@@ -558 +537 @@
    break;
 #endif
+  case ROAR_VIO_CTL_NONBLOCK:
+    if ( roar_socket_nonblock(_get(vio,fh), *(int*)data) == -1 ) {
+     return -1;
+    }
+
+    if ( *(int*)data == ROAR_SOCKET_NONBLOCK ) {
+     return 0;
+    }
+
+    roar_vio_sync(vio);
+   break;
   default:
    return -1;