ALSA: usb-audio: Change internal PCM order
PATCH 1/1 ALSA: usb-audio: Change internal PCM order
From: Johan Rastén <[email protected]>
New PCMs will now be added to the end of the chip's PCM list instead of to the front. This changes the way streams are combined so that the first capture stream will now be merged with the first playback stream instead of the last.
This fixes a problem with ASUS U7. Cards with one playback stream and cards without capture streams should be unaffected by this change.
Exception added for M-Audio Audiophile USB (tm) since it seems to have a fix to swap capture stream numbering in alsa-lib conf/cards/USB-audio.conf
sound/usb/stream.c +9 -2
@@ -377,8 +377,15 @@ int snd_usb_add_audio_stream(struct snd_usb_audio *chip,snd_usb_init_substream (as, stream, fp); -list_add (&as->list, &chip->pcm_list); +/* +* Keep using head insertion for M-Audio Audiophile USB (tm) which has a +* fix to swap capture stream order in conf/cards/USB-audio.conf +*/ +if (chip->usb_id ==USB_ID (0x0763 ,0x2003 )) +list_add (&as->list, &chip->pcm_list); +else +list_add_tail (&as->list, &chip->pcm_list); + chip->pcm_devs++;snd_usb_proc_pcm_format_add (as); --
2.1.4
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Takashi Iwai
AppliedQuoted 7 lines · On Sun, 06 Sep 2015 18:16:13 +0200, [email protected] wrote:
From: Johan Rastén <[email protected]>
New PCMs will now be added to the end of the chip's PCM list instead of to the front. This changes the way streams are combined so that the first capture stream will now be merged with the first playback stream instead of the last.
Quoted 7 lines
This fixes a problem with ASUS U7. Cards with one playback stream and cards without capture streams should be unaffected by this change.
Exception added for M-Audio Audiophile USB (tm) since it seems to have a fix to swap capture stream numbering in alsa-lib
conf/cards/USB-audio.confSigned-off-by Johan Rastén <[email protected]>
Thanks, applied now.
Takashi
Quoted 22 lines
sound/usb/stream.c +9
-2@@ -377,8 +377,15 @@ int snd_usb_add_audio_stream(struct snd_usb_audio *chip,snd_usb_init_substream (as, stream, fp); -list_add (&as->list, &chip->pcm_list); +/* +* Keep using head insertion for M-Audio Audiophile USB (tm) which has a +* fix to swap capture stream order in conf/cards/USB-audio.conf +*/ +if (chip->usb_id ==USB_ID (0x0763 ,0x2003 )) +list_add (&as->list, &chip->pcm_list); +else +list_add_tail (&as->list, &chip->pcm_list); + chip->pcm_devs++;snd_usb_proc_pcm_format_add (as); --
Quoted 2 lines
2.1.4
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel