Update of /cvsroot/alsa/alsa-driver/usb/us428 In directory sc8-pr-cvs1:/tmp/cvs-serv30438
Modified Files: usbus428.c usbus428audio.c usbus428ctldefs.h Log Message: - fixed the draining behavior (by Karsten). - fixed the use of no-name union. the old gcc doesn't accept this style as default. Index: usbus428.c =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- usbus428.c 25 Sep 2003 09:47:41 -0000 1.4 +++ usbus428.c 6 Oct 2003 13:15:17 -0000 1.5 @@ -173,7 +173,7 @@ if (0 == us428->AS04.urb[j]->status) { us428_p4out_t *p4out = us428ctls->p4out + send; // FIXME if more then 1 p4out is new, 1 gets lost. usb_fill_bulk_urb(us428->AS04.urb[j], us428->chip.dev, - usb_sndbulkpipe(us428->chip.dev, 0x04), &p4out->vol, + usb_sndbulkpipe(us428->chip.dev, 0x04), &p4out->val.vol, p4out->type == eLT_Light ? sizeof(us428_lights_t) : 5, snd_us428_Out04Int, us428); #ifdef OLD_USB Index: usbus428audio.c =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428audio.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- usbus428audio.c 30 Sep 2003 08:54:47 -0000 1.3 +++ usbus428audio.c 6 Oct 2003 13:15:17 -0000 1.4 @@ -401,13 +401,15 @@ } if (pcm_captsubs) - if (pcm_captsubs->runtime->status->state == SNDRV_PCM_STATE_RUNNING) + if (pcm_captsubs->runtime->status->state == SNDRV_PCM_STATE_RUNNING + || pcm_captsubs->runtime->status->state == SNDRV_PCM_STATE_DRAINING) runtime = pcm_captsubs->runtime; if (NULL == runtime){ snd_us428_substream_t *playsubs = captsubs->stream->substream + SNDRV_PCM_STREAM_PLAYBACK; snd_pcm_substream_t *pcm_playsubs = playsubs->pcm_substream; if (pcm_playsubs) - if (pcm_playsubs->runtime->status->state == SNDRV_PCM_STATE_RUNNING) + if (pcm_playsubs->runtime->status->state == SNDRV_PCM_STATE_RUNNING + || pcm_playsubs->runtime->status->state == SNDRV_PCM_STATE_DRAINING) runtime = pcm_playsubs->runtime; } Index: usbus428ctldefs.h =================================================================== RCS file: /cvsroot/alsa/alsa-driver/usb/us428/usbus428ctldefs.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- usbus428ctldefs.h 8 Sep 2003 10:57:41 -0000 1.1 +++ usbus428ctldefs.h 6 Oct 2003 13:15:17 -0000 1.2 @@ -118,7 +118,7 @@ union { usX2Y_volume_t vol; us428_lights_t lights; - }; + } val; } us428_p4out_t; #define N_us428_ctl_BUFS 16 ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog