Attachment 145501 Details for Bug 196583 – Handle xruns properly in alsa plugin

[patch] Handle xruns properly in alsa plugin

xmms-1.2.10-alsa-xrun.patch (text/plain), 2.07 KB, created by Sami Farin on 2007-01-12 23:42:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sami Farin

Created: 2007-01-12 23:42:27 UTC

Size: 2.07 KB

patch

obsolete

>--- xmms-1.2.10/Output/alsa/audio.c.bak	2007-01-12 22:45:31.547835000 +0200
>+++ xmms-1.2.10/Output/alsa/audio.c	2007-01-13 01:28:53.515235225 +0200
>@@ -120,23 +120,24 @@ int alsa_playing(void)
> static void xrun_recover(void)
> {
> 	int err;
>+	static int whined;
> 
>-	if (alsa_cfg.debug)
>-	{
>-		snd_pcm_status_alloca(&alsa_status);
>-		if ((err = snd_pcm_status(alsa_pcm, alsa_status)) < 0)
>-			g_warning("xrun_recover(): snd_pcm_status() failed");
>-		else
>-		{
>-			printf("Status:\n");
>-			snd_pcm_status_dump(alsa_status, logs);
>-		}
>-	}
>+	if ((err = snd_pcm_status(alsa_pcm, alsa_status)) < 0) {
>+		g_warning("xrun_recover(): snd_pcm_status() failed: %s",
>+			  snd_strerror(err));
>+	} else {
>+		if (snd_pcm_state(alsa_pcm) == SND_PCM_STATE_XRUN) {
>+			if (!whined) {
>+				whined = 1;
>+				g_warning("xrun_recover(): recovering from status SND_PCM_STATE_XRUN");
>+				snd_pcm_status_dump(alsa_status, logs);
>+			}
> 
>-	if (snd_pcm_state(alsa_pcm) == SND_PCM_STATE_XRUN)
>-	{
>-		if ((err = snd_pcm_prepare(alsa_pcm)) < 0)
>-			g_warning("xrun_recover(): snd_pcm_prepare() failed.");
>+			if ((err = snd_pcm_prepare(alsa_pcm)) < 0) {
>+				g_warning("xrun_recover(): snd_pcm_prepare() failed: %s",
>+					  snd_strerror(err));
>+			}
>+		}
> 	}
> }
> 
>@@ -757,7 +758,9 @@ static void alsa_mmap_audio(char *data, 
> 		else if (err != frames)
> 			g_warning("alsa_mmap_audio(): snd_pcm_mmap_commit "
> 				  "returned %d, expected %d", err, (int)frames);
>-		
>+
>+		xrun_recover();
>+
> 		alsa_total_written += cnt;
> 		
> 		length -= cnt;
>@@ -778,8 +781,7 @@ int alsa_open(AFormat fmt, int rate, int
> 	inputf = snd_format_from_xmms(fmt, rate, nch);
> 	effectf = snd_format_from_xmms(fmt, rate, nch);
> 	
>-	if (alsa_cfg.debug)
>-		snd_output_stdio_attach(&logs, stdout, 0);
>+	snd_output_stdio_attach(&logs, stdout, 0);
> 
> 	mmap = alsa_cfg.mmap;
> 
>@@ -1071,6 +1073,8 @@ static int alsa_setup(struct snd_format 
> 		}
> 	}
> 
>+	snd_pcm_status_alloca(&alsa_status);
>+
> 	debug("Device setup: buffer time: %i, size: %i.", alsa_buffer_time,
> 	      snd_pcm_frames_to_bytes(alsa_pcm, alsa_buffer_size));
> 	debug("bits per sample: %i; frame size: %i; Bps: %i",

Actions: View | Diff

Attachments on bug 196583: 145501