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

Fixes...

Browse source
This commit is contained in:
Jaroslav Kysela 1998-11-11 20:16:06 +00:00
parent c88e363767
commit 350e1007e3
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
alsactl/setup.c
View file

@ -229,7 +229,7 @@ int soundcard_setup_collect( int cardno )
} }
bzero( card, sizeof( struct soundcard ) ); bzero( card, sizeof( struct soundcard ) );
card -> no = cardno; card -> no = cardno;
for ( first = soundcards, prev = NULL; first; prev = first, first = first -> next ) for ( first = soundcards, prev = NULL; first; first = first -> next ) {
if ( first -> no > cardno ) { if ( first -> no > cardno ) {
if ( !prev ) { if ( !prev ) {
soundcards = card; soundcards = card;
@ -239,7 +239,15 @@ int soundcard_setup_collect( int cardno )
card -> next = first; card -> next = first;
break; break;
} }
if ( !soundcards ) soundcards = card; prev = first;
}
if ( !first ) {
if ( !soundcards ) {
soundcards = card;
} else {
prev -> next = card;
}
}
if ( (err = snd_ctl_hw_info( handle, &card -> control.hwinfo )) < 0 ) { if ( (err = snd_ctl_hw_info( handle, &card -> control.hwinfo )) < 0 ) {
snd_ctl_close( handle ); snd_ctl_close( handle );
error( "SND CTL HW INFO error: %s", snd_strerror( err ) ); error( "SND CTL HW INFO error: %s", snd_strerror( err ) );
@ -533,16 +541,16 @@ static void soundcard_setup_write_switch( FILE *out, int interface, const unsign
v[0] = '\0'; v[0] = '\0';
switch ( type ) { switch ( type ) {
case SND_CTL_SW_TYPE_BOOLEAN: s = "bool"; strcpy( v, pdata -> enable ? "true" : "false" ); break; case SND_CTL_SW_TYPE_BOOLEAN: s = "bool"; strcpy( v, pdata -> enable ? "true" : "false" ); break;
case SND_CTL_SW_TYPE_BYTE: s = "byte"; sprintf( v, "%ui", (unsigned int)pdata -> data8[0] ); break; case SND_CTL_SW_TYPE_BYTE: s = "byte"; sprintf( v, "%u", (unsigned int)pdata -> data8[0] ); break;
case SND_CTL_SW_TYPE_WORD: s = "word"; sprintf( v, "%ui", (unsigned int)pdata -> data16[0] ); break; case SND_CTL_SW_TYPE_WORD: s = "word"; sprintf( v, "%u", (unsigned int)pdata -> data16[0] ); break;
case SND_CTL_SW_TYPE_DWORD: s = "dword"; sprintf( v, "%ui", pdata -> data32[0] ); break; case SND_CTL_SW_TYPE_DWORD: s = "dword"; sprintf( v, "%u", pdata -> data32[0] ); break;
case SND_CTL_SW_TYPE_USER: s = "user"; break; case SND_CTL_SW_TYPE_USER: s = "user"; break;
default: default:
s = "unknown"; s = "unknown";
} }
fprintf( out, "%s; Type is '%s'.\n", space, s ); fprintf( out, "%s; Type is '%s'.\n", space, s );
if ( low != 0 || high != 0 ) if ( low != 0 || high != 0 )
fprintf( out, "%s; Accepted switch range is from %ui to %ui.\n", space, low, high ); fprintf( out, "%s; Accepted switch range is from %u to %u.\n", space, low, high );
if ( interface == SND_INTERFACE_CONTROL && type == SND_CTL_SW_TYPE_WORD && if ( interface == SND_INTERFACE_CONTROL && type == SND_CTL_SW_TYPE_WORD &&
!strcmp( name, SND_CTL_SW_JOYSTICK_ADDRESS ) ) { !strcmp( name, SND_CTL_SW_JOYSTICK_ADDRESS ) ) {
for ( idx = 1, first = 1; idx < 16; idx++ ) { for ( idx = 1, first = 1; idx < 16; idx++ ) {