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

roard/driver_alsa.c

@@ -231 +231 @@
  inst->sync     = driver_alsa_sync;
  inst->ctl      = driver_alsa_ctl;
- inst->nonblock = driver_dummy_nonblock;
 
  ROAR_DBG("driver_alsa_open_vio(inst=%p, device='%s', info=%p, fh=%i, sstream=%p) = 0", inst, device, info, fh, sstream);
@@ -333 +332 @@
  switch (cmd) {
   case ROAR_VIO_CTL_GET_DELAY:
-   if ( snd_pcm_delay(device->handle, &alsa_delay) < 0 )
+    if ( snd_pcm_delay(device->handle, &alsa_delay) < 0 )
+     return -1;
+    else {
+     *(uint_least32_t *)data = snd_pcm_frames_to_bytes(device->handle, alsa_delay);
+     ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_GET_DELAY(0x%.8x), data=%p): %i bytes.", vio, cmd, data, (int)(*(uint_least32_t*)data));
+    }
+   break;
+
+  case ROAR_VIO_CTL_SET_SSTREAMID:
+    device->ssid = *(int *)data;
+    ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_SET_SSTREAMID(0x%.8x), data=%p): ssid=%i", vio, cmd, data, device->ssid);
+   break;
+
+  case ROAR_VIO_CTL_SET_SSTREAM:
+    device->sstream = data;
+    ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_SET_SSTREAM(0x%.8x), data=%p): sstream=%p", vio, cmd, data, device->sstream);
+   break;
+
+  case ROAR_VIO_CTL_GET_AUINFO:
+    ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_GET_AUINFO(0x%.8x), data=%p) = ?", vio, cmd, data);
+    memcpy(data, &(device->info), sizeof(struct roar_audio_info));
+   break;
+
+  case ROAR_VIO_CTL_SET_AUINFO:
+    ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_SET_AUINFO(0x%.8x), data=%p) = ?", vio, cmd, data);
+    memcpy(&(device->info), data, sizeof(struct roar_audio_info));
+    return driver_alsa_reopen_device(device);
+   break;
+
+  case ROAR_VIO_CTL_NONBLOCK:
+    if ( *(int*)data == ROAR_SOCKET_BLOCK )
+     return 0;
+    roar_err_set(ROAR_ERROR_NOTSUP);
     return -1;
-   else {
-    *(uint_least32_t *)data = snd_pcm_frames_to_bytes(device->handle, alsa_delay);
-    ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_GET_DELAY(0x%.8x), data=%p): %i bytes.", vio, cmd, data, (int)(*(uint_least32_t*)data));
-   }
-   break;
-
-  case ROAR_VIO_CTL_SET_SSTREAMID:
-   device->ssid = *(int *)data;
-   ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_SET_SSTREAMID(0x%.8x), data=%p): ssid=%i", vio, cmd, data, device->ssid);
-   break;
-
-  case ROAR_VIO_CTL_SET_SSTREAM:
-   device->sstream = data;
-   ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_SET_SSTREAM(0x%.8x), data=%p): sstream=%p", vio, cmd, data, device->sstream);
-   break;
-
-  case ROAR_VIO_CTL_GET_AUINFO:
-   ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_GET_AUINFO(0x%.8x), data=%p) = ?", vio, cmd, data);
-   memcpy(data, &(device->info), sizeof(struct roar_audio_info));
-   break;
-
-  case ROAR_VIO_CTL_SET_AUINFO:
-   ROAR_DBG("driver_alsa_ctl(vio=%p, cmd=ROAR_VIO_CTL_SET_AUINFO(0x%.8x), data=%p) = ?", vio, cmd, data);
-   memcpy(&(device->info), data, sizeof(struct roar_audio_info));
-   return driver_alsa_reopen_device(device);
+   break;
 
   default: