Mercurial > mplayer.hg
comparison libao2/ao_alsa9.c @ 9587:f023b30c80e5
replace snd_pcm_drain with snd_pcm_drop
author | henry |
---|---|
date | Fri, 14 Mar 2003 20:36:26 +0000 |
parents | b8551709823d |
children | 12b1790038b0 |
comparison
equal
deleted
inserted
replaced
9586:2cc1ce724722 | 9587:f023b30c80e5 |
---|---|
748 /* stop playing and empty buffers (for seeking/pause) */ | 748 /* stop playing and empty buffers (for seeking/pause) */ |
749 static void reset() | 749 static void reset() |
750 { | 750 { |
751 int err; | 751 int err; |
752 | 752 |
753 if (!ao_noblock) { | 753 if ((err = snd_pcm_drop(alsa_handler)) < 0) |
754 //drain causes error in nonblock-mode! | 754 { |
755 if ((err = snd_pcm_drain(alsa_handler)) < 0) | 755 printf("alsa-reset: pcm drop error: %s\n", snd_strerror(err)); |
756 { | 756 return; |
757 printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err)); | 757 } |
758 return; | 758 if ((err = snd_pcm_prepare(alsa_handler)) < 0) |
759 } | 759 { |
760 | 760 printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err)); |
761 if ((err = snd_pcm_prepare(alsa_handler)) < 0) | 761 return; |
762 { | 762 } |
763 printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err)); | 763 return; |
764 return; | |
765 } | |
766 } else { | |
767 if (verbose>0) | |
768 printf("alsa-reset: reset nonblocked"); | |
769 return; | |
770 } | |
771 } | 764 } |
772 | 765 |
773 #ifdef USE_POLL | 766 #ifdef USE_POLL |
774 static int wait_for_poll(snd_pcm_t *handle, struct pollfd *ufds, unsigned int count) | 767 static int wait_for_poll(snd_pcm_t *handle, struct pollfd *ufds, unsigned int count) |
775 { | 768 { |