Changeset 5278:b3e0dd3f3141 in roaraudio for roard/driver_jack.c

Timestamp:

11/21/11 00:42:20 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

last parts of merging _nonblock into _ctl and fixed sizeof(cmd) of _ctls

File:

• roard/driver_jack.c (modified) (4 diffs)

roard/driver_jack.c

@@ -163 +163 @@
 }
 
-int     driver_jack_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+int     driver_jack_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
  struct driver_jack * self = vio->inst;
  // function for a lot control features.
@@ -184 +184 @@
     *(int*)data = FH...;
 */
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
@@ -191 +192 @@
    break;
   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
+    // 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
+    roar_err_set(ROAR_ERROR_NOTSUP);
+    return -1;
    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*.
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
   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.
+    // get or set block size used, data is uint_least32_t*, number of bytes.
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
   case ROAR_VIO_CTL_GET_DBLOCKS:
   case ROAR_VIO_CTL_SET_DBLOCKS:
-     // get or set number of blocks used, data is uint_least32_t*.
+    // get or set number of blocks used, data is uint_least32_t*.
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
   case ROAR_VIO_CTL_SET_SSTREAM:
     // set server stream object for this stream, data is struct roar_stream_server*
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
   case ROAR_VIO_CTL_SET_SSTREAMID:
     // set stream ID for this stream, data is int*
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
   case ROAR_VIO_CTL_SET_VOLUME:
     // set volume for this device, data is struct roar_mixer_settings*
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
    break;
@@ -226 +235 @@
     // get delay of this stream, data is uint_least32_t*, in bytes
     // there is more about delay. please ask.
-    return -1;
-   break;
-  default:
-    return -1;
-   break;
- }
+    roar_err_set(ROAR_ERROR_NOTSUP);
+    return -1;
+   break;
+ }
+
+ roar_err_set(ROAR_ERROR_BADRQC);
+ return -1;
 }