Changeset 1672:ebdd6c9efa55 in roaraudio

Timestamp:

05/11/09 23:49:43 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for hwmixer to oss driver (not working for me, OSS v4) and sndio driver

Location:

roard

Files:

• driver_oss.c (modified) (1 diff)
• driver_sndio.c (modified) (2 diffs)

roard/driver_oss.c

@@ -476 +476 @@
     return driver_oss_reopen_device(self);
    break;
+#ifdef SNDCTL_DSP_SETPLAYVOL
+  case ROAR_VIO_CTL_SET_VOLUME:
+    switch (self->info.channels) {
+     case 1:
+       d  = ROAR_MIXER(data)->mixer[0] * 100 / ROAR_MIXER(data)->scale;
+       d |= d << 8;
+      break;
+     case 2:
+       d  =  ROAR_MIXER(data)->mixer[0] * 100 / ROAR_MIXER(data)->scale;
+       d |= (ROAR_MIXER(data)->mixer[0] * 100 / ROAR_MIXER(data)->scale) << 8;
+      break;
+     default:
+      return -1;
+    }
+    return ioctl(_get(vio,fh), SNDCTL_DSP_SETPLAYVOL, &d);
+   break;
+#endif
   default:
    return -1;

roard/driver_sndio.c

@@ -181 +181 @@
 int     driver_sndio_ctl          (struct roar_vio_calls * vio, int cmd, void * data) {
  struct driver_sndio * self = vio->inst;
+ unsigned d;
 
  switch (cmd) {
@@ -196 +197 @@
     return driver_sndio_reopen_device(self);
    break;
+  case ROAR_VIO_CTL_SET_VOLUME:
+    switch (self->info.channels) {
+     case 1:
+       d = ROAR_MIXER(data)->mixer[0] * SIO_MAXVOL / ROAR_MIXER(data)->scale;
+      break;
+     case 2:
+       if ( ROAR_MIXER(data)->mixer[0] != ROAR_MIXER(data)->mixer[1] )
+        return -1;
+       d = ROAR_MIXER(data)->mixer[0] * SIO_MAXVOL / ROAR_MIXER(data)->scale;
+      break;
+     default:
+      return -1;
+    }
+    return sio_setvol(self->handle, d) == 0 ? -1 : 0;
+   break;
   default:
     return -1;