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

roard/driver_jack.c

@@ -65 +65 @@
  inst->write    = driver_jack_write;
  inst->lseek    = NULL; // no seeking on this device
- inst->nonblock = driver_jack_nonblock;
  inst->sync     = driver_jack_sync;
  inst->ctl      = driver_jack_ctl;
@@ -157 +156 @@
 }
 
-int     driver_jack_nonblock(struct roar_vio_calls * vio, int state) {
- struct driver_jack * self = vio->inst;
- // control if read and write calls should block untill all data is read or written.
- // state could be:
- //  ROAR_SOCKET_BLOCK    - Block untill the data is read or written
- //  ROAR_SOCKET_NONBLOCK - Return as soon as possible
- return -1;
-}
-
 int     driver_jack_sync    (struct roar_vio_calls * vio) {
  struct driver_jack * self = vio->inst;
@@ -200 +190 @@
     return 0;
    break;
-   case ROAR_VIO_CTL_GET_AUINFO:
-   case ROAR_VIO_CTL_SET_AUINFO:
+  case ROAR_VIO_CTL_NONBLOCK:
+ // control if read and write calls should block untill all data is read or written.
+ // state is in *(int*)data and could be:
+ //  ROAR_SOCKET_BLOCK    - Block untill the data is read or written
+ //  ROAR_SOCKET_NONBLOCK - Return as soon as possible
+   break;
+  case ROAR_VIO_CTL_GET_AUINFO:
+  case ROAR_VIO_CTL_SET_AUINFO:
     // get or set audio info, data is a struct roar_audio_info*.
     return -1;
    break;
-   case ROAR_VIO_CTL_GET_DBLKSIZE:
-   case ROAR_VIO_CTL_SET_DBLKSIZE:
+  case ROAR_VIO_CTL_GET_DBLKSIZE:
+  case ROAR_VIO_CTL_SET_DBLKSIZE:
      // get or set block size used, data is uint_least32_t*, number of bytes.
     return -1;
    break;
-   case ROAR_VIO_CTL_GET_DBLOCKS:
-   case ROAR_VIO_CTL_SET_DBLOCKS:
+  case ROAR_VIO_CTL_GET_DBLOCKS:
+  case ROAR_VIO_CTL_SET_DBLOCKS:
      // get or set number of blocks used, data is uint_least32_t*.
     return -1;
    break;
-   case ROAR_VIO_CTL_SET_SSTREAM:
+  case ROAR_VIO_CTL_SET_SSTREAM:
     // set server stream object for this stream, data is struct roar_stream_server*
     return -1;
    break;
-   case ROAR_VIO_CTL_SET_SSTREAMID:
+  case ROAR_VIO_CTL_SET_SSTREAMID:
     // set stream ID for this stream, data is int*
     return -1;
    break;
-   case ROAR_VIO_CTL_SET_VOLUME:
+  case ROAR_VIO_CTL_SET_VOLUME:
     // set volume for this device, data is struct roar_mixer_settings*
     return -1;
    break;
-   case ROAR_VIO_CTL_GET_DELAY:
+  case ROAR_VIO_CTL_GET_DELAY:
     // get delay of this stream, data is uint_least32_t*, in bytes
     // there is more about delay. please ask.