asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 23:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

More mixer updates and some fixes...

Browse source
This commit is contained in:
Jaroslav Kysela 1999-07-22 10:49:40 +00:00
parent 32f033d03c
commit 5eab4faf04
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alsactl/merge.c
View file

@ -143,7 +143,7 @@ int soundcard_setup_merge_switches(int cardno)
continue; continue;
soundcard_setup_merge_sw(soundcard->control.switches, rsoundcard->control.switches, soundcard->no, -1, "control"); soundcard_setup_merge_sw(soundcard->control.switches, rsoundcard->control.switches, soundcard->no, -1, "control");
for (rmixer = rsoundcard->mixers; rmixer; rmixer = rmixer->next) { for (rmixer = rsoundcard->mixers; rmixer; rmixer = rmixer->next) {
for (mixer = soundcard->mixers; mixer; mixer = rmixer->next) { for (mixer = soundcard->mixers; mixer; mixer = mixer->next) {
if (!strncmp(mixer->info.name, rmixer->info.name, sizeof(mixer->info.name))) if (!strncmp(mixer->info.name, rmixer->info.name, sizeof(mixer->info.name)))
break; break;
} }
@ -350,7 +350,7 @@ int soundcard_setup_merge_data(int cardno)
if (cardno >= 0 && soundcard->no != cardno) if (cardno >= 0 && soundcard->no != cardno)
continue; continue;
for (rmixer = rsoundcard->mixers; rmixer; rmixer = rmixer->next) { for (rmixer = rsoundcard->mixers; rmixer; rmixer = rmixer->next) {
for (mixer = soundcard->mixers; mixer; mixer = rmixer->next) { for (mixer = soundcard->mixers; mixer; mixer = mixer->next) {
if (!strncmp(mixer->info.name, rmixer->info.name, sizeof(mixer->info.name))) if (!strncmp(mixer->info.name, rmixer->info.name, sizeof(mixer->info.name)))
break; break;
} }

6
amixer/amixer.c
View file

@ -1463,7 +1463,11 @@ int main(int argc, char *argv[])
break; break;
case 'd': case 'd':
case HELPID_DEVICE: case HELPID_DEVICE:
device = device; device = atoi(optarg);
if (device < 0 || device > 32) {
fprintf(stderr, "Error: device %i is invalid\n", device);
return 1;
}
break; break;
case 'q': case 'q':
case HELPID_QUIET: case HELPID_QUIET: