Changeset 3153:1249b2b9781a in roaraudio
- Timestamp:
- 01/15/10 16:24:32 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroaross/libroaross.c
r3152 r3153 64 64 #endif 65 65 66 #define OSS_VOLUME_SCALE 100 67 66 68 #define _MAX_POINTER 8 67 69 … … 480 482 case OSS_GETVERSION: name = "OSS_GETVERSION"; break; 481 483 case SOUND_MIXER_READ_RECSRC: name = "SOUND_MIXER_READ_RECSRC"; break; 482 case SOUND_MIXER_READ_RECMASK: name = "SOUND_MIXER_READ_RECMASK"; break;483 484 case SOUND_MIXER_READ_STEREODEVS: name = "SOUND_MIXER_READ_STEREODEVS"; break; 484 485 case SOUND_MIXER_READ_CAPS: name = "SOUND_MIXER_READ_CAPS"; break; … … 523 524 if ( o_w ) { 524 525 mixer.scale = 65535; 525 mixer.mixer[0] = ( *ip & 0xFF)*65535/ 50;526 mixer.mixer[1] = ((*ip >> 8) & 0xFF)*65535/ 50;526 mixer.mixer[0] = ( *ip & 0xFF)*65535/OSS_VOLUME_SCALE; 527 mixer.mixer[1] = ((*ip >> 8) & 0xFF)*65535/OSS_VOLUME_SCALE; 527 528 if ( roar_set_vol(&(handle->session->con), o_sid, &mixer, 2) == -1 ) { 528 529 errno = ENOSYS; … … 535 536 return -1; 536 537 } 537 *ip = (( 50*mixer.mixer[0])/mixer.scale) | (((50*mixer.mixer[0])/mixer.scale)<<8);538 *ip = ((OSS_VOLUME_SCALE*mixer.mixer[0])/mixer.scale) | (((OSS_VOLUME_SCALE*mixer.mixer[0])/mixer.scale)<<8); 538 539 return 0; 539 540 } … … 563 564 *ip |= SOUND_MASK_DIGITAL3; 564 565 566 return 0; 567 break; 568 case SOUND_MIXER_READ_RECMASK: 569 *ip = SOUND_MASK_VOLUME; // we can currently only read from mixer 565 570 return 0; 566 571 break;
Note: See TracChangeset
for help on using the changeset viewer.