changeset 885:1d8d643134db trunk

[svn] - alsa: handle errors on snd_pcm_wait (xrun, supend)
author giacomo
date Wed, 21 Mar 2007 05:18:25 -0700
parents 4fd90f2d1832
children f2fde7b4dccd
files ChangeLog src/alsa/audio.c
diffstat 2 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 21 02:32:49 2007 -0700
+++ b/ChangeLog	Wed Mar 21 05:18:25 2007 -0700
@@ -1,3 +1,14 @@
+2007-03-21 09:32:49 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [1868]
+  improve support for static playlist:
+  - make use of Playlist.attribute.
+  - now xspf plugin is capable of embedding static playlist marker. user can specify at "Save Playlist" dialog.
+  - all meaningful mtime value will be preserved even if a playlist file is handled as static playlist.
+  
+  trunk/src/xspf/xspf.c |   46 +++++++++++++++++++++++++++-------------------
+  1 file changed, 27 insertions(+), 19 deletions(-)
+
+
 2007-03-21 01:55:57 +0000  Giacomo Lozito <james@develia.org>
   revision [1866]
   - aosd: use a single ghosd object for all of the osd showups; this will be a lot gentler to XLib and should definitely help with stability
--- a/src/alsa/audio.c	Wed Mar 21 02:32:49 2007 -0700
+++ b/src/alsa/audio.c	Wed Mar 21 05:18:25 2007 -0700
@@ -837,10 +837,15 @@
 		if (!paused && !prebuffer &&
 		    get_thread_buffer_filled() > hw_period_size_in)
 		{
-			if (snd_pcm_wait(alsa_pcm, 10) > 0)
+			int wr = snd_pcm_wait(alsa_pcm, 10);
+			if (wr > 0)
 			{
 				alsa_write_out_thread_data();
 			}
+			else if (wr < 0)
+			{
+				alsa_handle_error(wr);
+			}
 		}
 		else
 			xmms_usleep(10000);