Changeset 3156:e07625a1a2e7 in roaraudio


Ignore:
Timestamp:
01/15/10 16:53:34 (12 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

got it to work with gnome mixer!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libroaross/libroaross.c

    r3155 r3156  
    475475  case SOUND_MIXER_AGC:              name = "SOUND_MIXER_AGC";              break; 
    476476  case SOUND_MIXER_3DSE:             name = "SOUND_MIXER_3DSE";             break; 
     477  case SOUND_MIXER_GETLEVELS:        name = "SOUND_MIXER_GETLEVELS";        break; 
     478  case SOUND_MIXER_SETLEVELS:        name = "SOUND_MIXER_SETLEVELS";        break; 
    477479  case SOUND_MIXER_PRIVATE1:         name = "SOUND_MIXER_PRIVATE1";         break; 
    478480  case SOUND_MIXER_PRIVATE2:         name = "SOUND_MIXER_PRIVATE2";         break; 
     
    481483  case SOUND_MIXER_PRIVATE5:         name = "SOUND_MIXER_PRIVATE5";         break; 
    482484  case OSS_GETVERSION:               name = "OSS_GETVERSION";               break; 
    483   case SOUND_MIXER_READ_CAPS:        name = "SOUND_MIXER_READ_CAPS";        break; 
     485//  case SOUND_MIXER_READ_CAPS:        name = "SOUND_MIXER_READ_CAPS";        break; 
     486  case SOUND_MIXER_READ_MUTE:        name = "SOUND_MIXER_READ_MUTE";        break; 
    484487/* 
     488  case :     name = "";     break; 
    485489  case :     name = "";     break; 
    486490*/ 
     
    524528   mixer.mixer[1] = ((*ip >> 8) & 0xFF)*65535/OSS_VOLUME_SCALE; 
    525529   if ( roar_set_vol(&(handle->session->con), o_sid, &mixer, 2) == -1 ) { 
    526     errno = ENOSYS; 
     530    errno = EIO; 
    527531    return -1; 
    528532   } 
     
    530534  } else { 
    531535   if ( roar_get_vol(&(handle->session->con), o_sid, &mixer, &channels) == -1 ) { 
    532     errno = ENOSYS; 
     536    errno = EIO; 
    533537    return -1; 
    534538   } 
     
    556560     *ip |= SOUND_MASK_LINE3; 
    557561    if ( _mix_settings.sid.digital1 != -1 ) 
     562#if 0 
    558563     *ip |= SOUND_MASK_DIGITAL1; 
    559564    if ( _mix_settings.sid.digital2 != -1 ) 
     
    561566    if ( _mix_settings.sid.digital3 != -1 ) 
    562567     *ip |= SOUND_MASK_DIGITAL3; 
     568#endif 
    563569 
    564570    return 0; 
     
    577583    } 
    578584   break; 
     585  case SOUND_MIXER_READ_CAPS: 
     586    *ip = 0; 
     587    return 0; 
     588   break; 
    579589 } 
    580590 
    581591 ROAR_DBG("_ioctl_mixer(handle=%p, req=%lu, ip=%p): unknown mixer CTL", handle, req, ip); 
     592// _os.ioctl(-1, req, ip); 
    582593 ROAR_DBG("_ioctl_mixer(handle=%p, req=%lu, ip=%p) = -1 // errno = ENOSYS", handle, req, ip); 
    583594 errno = ENOSYS; 
Note: See TracChangeset for help on using the changeset viewer.