Changeset 3156:e07625a1a2e7 in roaraudio

Timestamp:

01/15/10 16:53:34 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got it to work with gnome mixer!

File:

• libroaross/libroaross.c (modified) (7 diffs)

libroaross/libroaross.c

@@ -475 +475 @@
   case SOUND_MIXER_AGC:              name = "SOUND_MIXER_AGC";              break;
   case SOUND_MIXER_3DSE:             name = "SOUND_MIXER_3DSE";             break;
+  case SOUND_MIXER_GETLEVELS:        name = "SOUND_MIXER_GETLEVELS";        break;
+  case SOUND_MIXER_SETLEVELS:        name = "SOUND_MIXER_SETLEVELS";        break;
   case SOUND_MIXER_PRIVATE1:         name = "SOUND_MIXER_PRIVATE1";         break;
   case SOUND_MIXER_PRIVATE2:         name = "SOUND_MIXER_PRIVATE2";         break;
@@ -481 +483 @@
   case SOUND_MIXER_PRIVATE5:         name = "SOUND_MIXER_PRIVATE5";         break;
   case OSS_GETVERSION:               name = "OSS_GETVERSION";               break;
-  case SOUND_MIXER_READ_CAPS:        name = "SOUND_MIXER_READ_CAPS";        break;
+//  case SOUND_MIXER_READ_CAPS:        name = "SOUND_MIXER_READ_CAPS";        break;
+  case SOUND_MIXER_READ_MUTE:        name = "SOUND_MIXER_READ_MUTE";        break;
 /*
+  case :     name = "";     break;
   case :     name = "";     break;
 */
@@ -524 +528 @@
    mixer.mixer[1] = ((*ip >> 8) & 0xFF)*65535/OSS_VOLUME_SCALE;
    if ( roar_set_vol(&(handle->session->con), o_sid, &mixer, 2) == -1 ) {
-    errno = ENOSYS;
+    errno = EIO;
     return -1;
    }
@@ -530 +534 @@
   } else {
    if ( roar_get_vol(&(handle->session->con), o_sid, &mixer, &channels) == -1 ) {
-    errno = ENOSYS;
+    errno = EIO;
     return -1;
    }
@@ -556 +560 @@
      *ip |= SOUND_MASK_LINE3;
     if ( _mix_settings.sid.digital1 != -1 )
+#if 0
      *ip |= SOUND_MASK_DIGITAL1;
     if ( _mix_settings.sid.digital2 != -1 )
@@ -561 +566 @@
     if ( _mix_settings.sid.digital3 != -1 )
      *ip |= SOUND_MASK_DIGITAL3;
+#endif
 
     return 0;
@@ -577 +583 @@
     }
    break;
+  case SOUND_MIXER_READ_CAPS:
+    *ip = 0;
+    return 0;
+   break;
  }
 
  ROAR_DBG("_ioctl_mixer(handle=%p, req=%lu, ip=%p): unknown mixer CTL", handle, req, ip);
+// _os.ioctl(-1, req, ip);
  ROAR_DBG("_ioctl_mixer(handle=%p, req=%lu, ip=%p) = -1 // errno = ENOSYS", handle, req, ip);
  errno = ENOSYS;