- change period_time in alsa09 to 60 (fixes #576)

- continue if no data transferred or interrupt signal (fixes #683)
- rename alsa -> alsa05 and alsa09 -> alsa



git-svn-id: http://svn.xiph.org/trunk/ao@9562 0101bb08-14d6-0310-b084-bc0e0c8e3800

src/plugins/alsa/ao_alsa.c

@@ -42,7 +42,7 @@ static ao_info ao_alsa_info =
 {
 	AO_TYPE_LIVE,
 	"Advanced Linux Sound Architecture (ALSA) output",
-	"alsa",
+	"alsa05",
 	"Stan Seibert <volsung@asu.edu>",
 	"Outputs to the Advanced Linux Sound Architecture version 0.5.x.",
 	AO_FMT_NATIVE,

src/plugins/alsa09/ao_alsa09.c

@@ -44,7 +44,7 @@
 
 /* the period time is calculated if not given as an option
  * note, playback starts after four of these are in the buffer */
-#define AO_ALSA_PERIOD_TIME 0
+#define AO_ALSA_PERIOD_TIME 50
 
 /* number of samples between interrupts
  * supplying a period_time to ao overrides the use of this  */
@@ -75,7 +75,7 @@ static ao_info ao_alsa_info =
 {
 	AO_TYPE_LIVE,
 	"Advanced Linux Sound Architecture (ALSA) output",
-	"alsa09",
+	"alsa",
 	"Bill Currie <bill@taniwha.org>/Kevin Cody, Jr. <kevinc@wuff.dhs.org>",
 	"Outputs to the Advanced Linux Sound Architecture version 0.9.x.",
 	AO_FMT_NATIVE,
@@ -455,8 +455,8 @@ int ao_plugin_play(ao_device *device, const char *output_samples,
 		/* try to write the entire buffer at once */
 		err = internal->writei(internal->pcm_handle, ptr, len);
 
-		/* it's possible that no data was transferred */
-		if (err == -EAGAIN) {
+		/* no data transferred or interrupt signal */
+		if (err == -EAGAIN || err == -EINTR) {
 			continue;
 		}