# HG changeset patch
# User nhjm449
# Date 1150451913 25200
# Node ID e43225462cdc15e4ab7b0cbdd64052aa063efe46
# Parent  847d9a218f665f099b93cc8fb6a9366ec16c858b
[svn] - Buffer indicator support for anyone crazy enough to stream flac.

diff -r 847d9a218f66 -r e43225462cdc ChangeLog
--- a/ChangeLog	Fri Jun 16 02:35:49 2006 -0700
+++ b/ChangeLog	Fri Jun 16 02:58:33 2006 -0700
@@ -1,3 +1,15 @@
+2006-06-16 09:35:49 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1464]
+  - use mutex locking to make alsa stay happy with dmix
+  
+
+  Changes:        Modified:
+  +4 -0           trunk/Plugins/Output/alsa/alsa.c  
+  +2 -0           trunk/Plugins/Output/alsa/alsa.h  
+  +12 -0          trunk/Plugins/Output/alsa/audio.c  
+  +2 -0           trunk/Plugins/Output/alsa/init.c  
+
+
 2006-06-16 09:24:10 +0000  George Averill <nhjm449@gmail.com>
   revision [1462]
   - Buffer indicator support for vorbis.
diff -r 847d9a218f66 -r e43225462cdc Plugins/Input/flac/http.c
--- a/Plugins/Input/flac/http.c	Fri Jun 16 02:35:49 2006 -0700
+++ b/Plugins/Input/flac/http.c	Fri Jun 16 02:58:33 2006 -0700
@@ -634,7 +634,10 @@
 	{
 
 		if (!http_used() && !flac_ip.output->buffer_playing())
+		{
 			prebuffering = TRUE;
+			flac_ip.set_status_buffering(TRUE);
+		}
 		if (http_free() > 0 && !eof)
 		{
 			if (http_check_for_data())
@@ -649,6 +652,7 @@
 					if (prebuffering)
 					{
 						prebuffering = FALSE;
+						flac_ip.set_status_buffering(FALSE);
 
 						flac_ip.set_info_text(NULL);
 					}
@@ -663,6 +667,7 @@
 				if (http_used() > prebuffer_length)
 				{
 					prebuffering = FALSE;
+					flac_ip.set_status_buffering(FALSE);
 					flac_ip.set_info_text(NULL);
 				}
 				else
@@ -715,6 +720,7 @@
 	buffer_read = 0;
 	icy_metaint = 0;
 	prebuffering = TRUE;
+	flac_ip.set_status_buffering(TRUE);
 	going = TRUE;
 	eof = FALSE;
 	buffer = g_malloc(buffer_length);