changeset 755:efc2d680cac8 trunk

[svn] - only do shoutcast stuff if info::size = 0. closes #601 again.
author nenolod
date Wed, 28 Feb 2007 18:00:41 -0800
parents a77533b76084
children f409eed7694d
files ChangeLog src/madplug/input.c
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 28 17:52:11 2007 -0800
+++ b/ChangeLog	Wed Feb 28 18:00:41 2007 -0800
@@ -1,3 +1,12 @@
+2007-03-01 01:52:11 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1606]
+  - fix a ringbuffering error in curl which caused trouble with icecast2 
+    MP3. Closes #816.
+  
+  trunk/src/curl/curl.c |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2007-03-01 01:33:16 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1604]
   - set timeout value to 3 seconds
--- a/src/madplug/input.c	Wed Feb 28 17:52:11 2007 -0800
+++ b/src/madplug/input.c	Wed Feb 28 18:00:41 2007 -0800
@@ -433,7 +433,7 @@
     vfs_fseek(info->infile, 0, SEEK_SET);
     info->offset = 0;
 
-    if(info->remote){
+    if(info->remote && info->size == 0){
         gchar *stream_name = vfs_get_metadata(info->infile, "stream-name");
         gchar *track_name = vfs_get_metadata(info->infile, "track-name");
         gchar *tmp = NULL;
@@ -499,7 +499,7 @@
 		    madinfo->playback->eof = TRUE;
     }
     
-    if(madinfo->remote) {
+    if(madinfo->remote && madinfo->size == 0) {
         gchar *stream_name = vfs_get_metadata(madinfo->infile, "stream-name");
         gchar *track_name = vfs_get_metadata(madinfo->infile, "track-name");
         gchar *tmp = NULL;