Changeset 3153:1249b2b9781a in roaraudio

Timestamp:

01/15/10 16:24:32 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected OSS volume scale, (WTF wrote wronge values into esddsp.c? next time listen to my fealing which was correct...)

File:

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

libroaross/libroaross.c

@@ -64 +64 @@
 #endif
 
+#define OSS_VOLUME_SCALE 100
+
 #define _MAX_POINTER  8
 
@@ -480 +482 @@
   case OSS_GETVERSION:               name = "OSS_GETVERSION";               break;
   case SOUND_MIXER_READ_RECSRC:      name = "SOUND_MIXER_READ_RECSRC";      break;
-  case SOUND_MIXER_READ_RECMASK:     name = "SOUND_MIXER_READ_RECMASK";     break;
   case SOUND_MIXER_READ_STEREODEVS:  name = "SOUND_MIXER_READ_STEREODEVS";  break;
   case SOUND_MIXER_READ_CAPS:        name = "SOUND_MIXER_READ_CAPS";        break;
@@ -523 +524 @@
   if ( o_w ) {
    mixer.scale    = 65535;
-   mixer.mixer[0] = ( *ip       & 0xFF)*65535/50;
-   mixer.mixer[1] = ((*ip >> 8) & 0xFF)*65535/50;
+   mixer.mixer[0] = ( *ip       & 0xFF)*65535/OSS_VOLUME_SCALE;
+   mixer.mixer[1] = ((*ip >> 8) & 0xFF)*65535/OSS_VOLUME_SCALE;
    if ( roar_set_vol(&(handle->session->con), o_sid, &mixer, 2) == -1 ) {
     errno = ENOSYS;
@@ -535 +536 @@
     return -1;
    }
-   *ip = ((50*mixer.mixer[0])/mixer.scale) | (((50*mixer.mixer[0])/mixer.scale)<<8);
+   *ip = ((OSS_VOLUME_SCALE*mixer.mixer[0])/mixer.scale) | (((OSS_VOLUME_SCALE*mixer.mixer[0])/mixer.scale)<<8);
    return 0;
   }
@@ -563 +564 @@
      *ip |= SOUND_MASK_DIGITAL3;
 
+    return 0;
+   break;
+  case SOUND_MIXER_READ_RECMASK:
+    *ip = SOUND_MASK_VOLUME; // we can currently only read from mixer
     return 0;
    break;