# HG changeset patch
# User nhjm449
# Date 1150449850 25200
# Node ID d7d7037fc58382b58473afbfc19e5ba07dc3cc0f
# Parent  3b990c26fc46fad62811dd2569f840bed3942e88
[svn] - Buffer indicator support for vorbis.

diff -r 3b990c26fc46 -r d7d7037fc583 ChangeLog
--- a/ChangeLog	Fri Jun 16 02:17:33 2006 -0700
+++ b/ChangeLog	Fri Jun 16 02:24:10 2006 -0700
@@ -1,3 +1,21 @@
+2006-06-16 09:17:33 +0000  George Averill <nhjm449@gmail.com>
+  revision [1460]
+  - Support for the buffer indicator in playpaus.png that was apparently 
+  ignored by XMMS devs. Supports mp3 streams only, at the moment.
+  
+
+  Changes:        Modified:
+  +6 -1           trunk/Plugins/Input/mpg123/http.c  
+  +17 -0          trunk/audacious/input.c  
+  +2 -0           trunk/audacious/input.h  
+  +3 -0           trunk/audacious/playback.c  
+  +17 -2          trunk/audacious/playstatus.c  
+  +2 -0           trunk/audacious/playstatus.h  
+  +1 -0           trunk/audacious/plugin.h  
+  +2 -1           trunk/audacious/pluginenum.c  
+  +0 -0           trunk/skin/playpaus.png  
+
+
 2006-06-16 08:45:08 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1458]
   - fix ui_fileinfo problem
diff -r 3b990c26fc46 -r d7d7037fc583 Plugins/Input/vorbis/http.c
--- a/Plugins/Input/vorbis/http.c	Fri Jun 16 02:17:33 2006 -0700
+++ b/Plugins/Input/vorbis/http.c	Fri Jun 16 02:24:10 2006 -0700
@@ -572,8 +572,10 @@
 
     while (going) {
 
-        if (!http_used() && !vorbis_ip.output->buffer_playing())
+        if (!http_used() && !vorbis_ip.output->buffer_playing()) {
             prebuffering = TRUE;
+            vorbis_ip.set_status_buffering(TRUE);
+        }
         if (http_free() > 0 && !eof) {
             if (http_check_for_data()) {
                 cnt = min(http_free(), buffer_length - wr_index);
@@ -584,6 +586,7 @@
                     eof = TRUE;
                     if (prebuffering) {
                         prebuffering = FALSE;
+                        vorbis_ip.set_status_buffering(FALSE);
 
                         vorbis_ip.set_info_text(NULL);
                     }
@@ -596,6 +599,7 @@
             if (prebuffering) {
                 if (http_used() > prebuffer_length) {
                     prebuffering = FALSE;
+                    vorbis_ip.set_status_buffering(FALSE);
                     vorbis_ip.set_info_text(NULL);
                 }
                 else {
@@ -643,6 +647,7 @@
     prebuffer_length = (buffer_length * vorbis_cfg.http_prebuffer) / 100;
     buffer_read = 0;
     prebuffering = TRUE;
+    vorbis_ip.set_status_buffering(TRUE);
     going = TRUE;
     eof = FALSE;
     buffer = g_malloc(buffer_length);