Changeset 5276:0eb24ca6810e in roaraudio for roard/driver_artsc.c

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

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

File:

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

roard/driver_artsc.c

@@ -124 +124 @@
  inst->close    = driver_artsc_close;
  inst->ctl      = driver_artsc_ctl;
- inst->nonblock = driver_artsc_nonblock;
 
  ROAR_DBG("driver_artsc_open_vio(*) = 0");
@@ -155 +154 @@
 
  return driver_artsc_init_shutdown(SHUTDOWN);
-}
-
-int     driver_artsc_nonblock(struct roar_vio_calls * vio, int state) {
- struct roar_artsc * self = vio->inst;
- int ret;
-
- switch (state) {
-  case ROAR_SOCKET_NONBLOCK:
-    ret = arts_stream_set(self->stream, ARTS_P_BLOCKING, 0);
-    if ( ret == 0 )
-     return 0;
-   break;
-  case ROAR_SOCKET_BLOCK:
-    ret = arts_stream_set(self->stream, ARTS_P_BLOCKING, 1);
-    if ( ret == 1 )
-     return 0;
-   break;
- }
-
- return -1;
 }
 
@@ -206 +185 @@
 
     return 0;
+  case ROAR_VIO_CTL_NONBLOCK:
+    switch (*(int*)data) {
+     case ROAR_SOCKET_NONBLOCK:
+       ret = arts_stream_set(self->stream, ARTS_P_BLOCKING, 0);
+       if ( ret == 0 )
+        return 0;
+       return -1;
+      break;
+     case ROAR_SOCKET_BLOCK:
+       ret = arts_stream_set(self->stream, ARTS_P_BLOCKING, 1);
+       if ( ret == 1 )
+        return 0;
+       return -1;
+      break;
+    }
+   break;
   default:
     return -1;