X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_alsa.c;h=96c8b2d1abeee45cb058ca48b16791ea6b967bfc;hb=ddf849372d36beda0e4b91b5363e39db6c75cb6a;hp=23d66bd9285d59aa0bd2dc49d9bd9094bd0b1ad3;hpb=2fb28c32491ce770550ebd59e0e9f222b4378b9a;p=xonotic%2Fdarkplaces.git

diff --git a/snd_alsa.c b/snd_alsa.c
index 23d66bd9..96c8b2d1 100644
--- a/snd_alsa.c
+++ b/snd_alsa.c
@@ -23,10 +23,10 @@
 
 // ALSA module, used by Linux
 
+#include "quakedef.h"
 
 #include <alsa/asoundlib.h>
 
-#include "quakedef.h"
 #include "snd_main.h"
 
 
@@ -63,7 +63,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
 		if (suggested != NULL)
 		{
-			memcpy (suggested, requested, sizeof (suggested));
+			memcpy (suggested, requested, sizeof (*suggested));
 
 			if (requested->width < 1)
 				suggested->width = 1;
@@ -283,7 +283,7 @@ static snd_pcm_sframes_t SndSys_Write (const unsigned char* buffer, unsigned int
 	written = snd_pcm_writei (pcm_handle, buffer, nbframes);
 	if (written < 0)
 	{
-		if (developer.integer >= 100)
+		if (developer.integer >= 1000 && vid_activewindow)
 			Con_Printf ("SndSys_Write: audio write returned %ld (%s)!\n",
 						 written, snd_strerror (written));
 
@@ -295,6 +295,11 @@ static snd_pcm_sframes_t SndSys_Write (const unsigned char* buffer, unsigned int
 							 written, snd_strerror (written));
 		}
 	}
+	if (written > 0)
+	{
+		snd_renderbuffer->startframe += written;
+		expected_delay += written;
+	}
 	
 	return written;
 }
@@ -325,12 +330,7 @@ void SndSys_Submit (void)
 	if (nbframes > limit)
 	{
 		written = SndSys_Write (&snd_renderbuffer->ring[startoffset * factor], limit);
-		if (written < 0)
-			return;
-		snd_renderbuffer->startframe += written;
-		expected_delay += written;
-
-		if ((snd_pcm_uframes_t)written != limit)
+		if (written < 0 || (snd_pcm_uframes_t)written != limit)
 			return;
 		
 		nbframes -= limit;
@@ -340,9 +340,6 @@ void SndSys_Submit (void)
 	written = SndSys_Write (&snd_renderbuffer->ring[startoffset * factor], nbframes);
 	if (written < 0)
 		return;
-
-	snd_renderbuffer->startframe += written;
-	expected_delay += written;
 }
 
 
@@ -364,7 +361,7 @@ unsigned int SndSys_GetSoundTime (void)
 	err = snd_pcm_delay (pcm_handle, &delay);
 	if (err != 0)
 	{
-		if (developer.integer >= 100)
+		if (developer.integer >= 1000 && vid_activewindow)
 			Con_DPrintf ("SndSys_GetSoundTime: can't get playback delay (%s)\n",
 					 	 snd_strerror (err));