asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 00:45:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixes for multiple soundcards and joystick address.

Browse source
This commit is contained in:
Jaroslav Kysela 1998-12-05 11:19:22 +00:00
parent 937b3caa1b
commit d55abb225a
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
alsactl/setup.c
View file

@ -559,7 +559,12 @@ static void soundcard_setup_write_switch(FILE * out, int interface, const unsign
break; break;
case SND_CTL_SW_TYPE_WORD: case SND_CTL_SW_TYPE_WORD:
s = "word"; s = "word";
sprintf(v, "%u", (unsigned int) pdata->data16[0]); if (interface == SND_INTERFACE_CONTROL &&
!strcmp(name, SND_CTL_SW_JOYSTICK_ADDRESS)) {
sprintf(v, "0x%x", (unsigned int) pdata->data16[0]);
} else {
sprintf(v, "%u", (unsigned int) pdata->data16[0]);
}
break; break;
case SND_CTL_SW_TYPE_DWORD: case SND_CTL_SW_TYPE_DWORD:
s = "dword"; s = "dword";
@ -864,8 +869,10 @@ int soundcard_setup_process(int cardno)
} }
} }
} }
if(ctlhandle) {
snd_ctl_close(ctlhandle);
ctlhandle = NULL;
}
} }
if (ctlhandle)
snd_ctl_close(ctlhandle);
return 1; return 1;
} }