--- cvoicecontrol-0.9alpha/cvoicecontrol/mixer.c 2006-05-10 19:49:22.000000000 +0200 +++ cvoicecontrol-0.9alpha/cvoicecontrol/mixer.c 2006-05-10 19:49:50.000000000 +0200 @@ -136,7 +136,7 @@ if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &mask_mixer) == -1) return(MIXER_ERR); - if (!(mask_mixer & SOUND_MASK_MIC)) + if (!(mask_mixer & SOUND_MASK_LINE)) return(MIXER_ERR); /* @@ -149,7 +149,7 @@ if (ioctl(fd, SOUND_MIXER_READ_RECMASK, &mask_mixer) == -1) return(MIXER_ERR); - if (!(mask_mixer & SOUND_MASK_MIC)) + if (!(mask_mixer & SOUND_MASK_LINE)) return(MIXER_ERR); /***** set microphone as active recording channel */ @@ -157,14 +157,14 @@ if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &mask_mixer) == -1) return(MIXER_ERR); - if (!(mask_mixer & SOUND_MASK_MIC)) + if (!(mask_mixer & SOUND_MASK_LINE)) { - mask_mixer = SOUND_MASK_MIC; + mask_mixer = SOUND_MASK_LINE; if (ioctl(fd, SOUND_MIXER_WRITE_RECSRC, &mask_mixer) == -1) return(MIXER_ERR); if (ioctl(fd, SOUND_MIXER_READ_RECSRC, &mask_mixer) == -1) return(MIXER_ERR); - if (!(mask_mixer & SOUND_MASK_MIC)) + if (!(mask_mixer & SOUND_MASK_LINE)) return(MIXER_ERR); } @@ -207,10 +207,10 @@ if ((fd = open(result.gl_pathv[i], O_RDWR, 0)) != -1 && ioctl(fd, SOUND_MIXER_READ_DEVMASK, &mask_mixer) != -1 && - (mask_mixer & SOUND_MASK_MIC) && + (mask_mixer & SOUND_MASK_LINE) && /* (mask_mixer & SOUND_MASK_IGAIN) && */ ioctl(fd, SOUND_MIXER_READ_RECMASK, &mask_mixer) != -1 && - (mask_mixer & SOUND_MASK_MIC)) + (mask_mixer & SOUND_MASK_LINE)) { /***** if mixer device looks ok add it to the list */ @@ -247,7 +247,7 @@ mask = (level<<8)|level; /***** set left and right channel to the same value */ - if (ioctl(fd, SOUND_MIXER_WRITE_MIC, &mask) == -1) + if (ioctl(fd, SOUND_MIXER_WRITE_LINE, &mask) == -1) return(MIXER_ERR); close(fd);