# HG changeset patch
# User nenolod
# Date 1169376050 28800
# Node ID d7c07f0278cd4683a3c5ed32ec12271ca9692869
# Parent  845c802dbe969d87a217411fa9493a174834b327
[svn] - cleanups

diff -r 845c802dbe96 -r d7c07f0278cd ChangeLog
--- a/ChangeLog	Sun Jan 21 02:38:15 2007 -0800
+++ b/ChangeLog	Sun Jan 21 02:40:50 2007 -0800
@@ -1,3 +1,14 @@
+2007-01-21 10:38:15 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [1038]
+  - remove integrated http in lieu of builtin vorbis http
+  
+  trunk/src/vorbis/Makefile |    2 
+  trunk/src/vorbis/http.c   |  676 ----------------------------------------------
+  trunk/src/vorbis/http.h   |   10 
+  trunk/src/vorbis/vorbis.c |   27 -
+  4 files changed, 1 insertion(+), 714 deletions(-)
+
+
 2007-01-21 10:35:18 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [1036]
   - newvfs probing support
diff -r 845c802dbe96 -r d7c07f0278cd src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Sun Jan 21 02:38:15 2007 -0800
+++ b/src/vorbis/vorbis.c	Sun Jan 21 02:40:50 2007 -0800
@@ -453,7 +453,6 @@
     else {
         /* file is a stream */
         vorbis_is_streaming = 1;
-        vorbis_http_open(filename);
         datasource = "NULL";
     }
 
@@ -851,10 +850,7 @@
                                               vorbis_cfg.tag_format :
                                               xmms_get_gentitle_format(),
                                               input))) {
-        if (!vorbis_is_streaming)
-            displaytitle = g_strdup(input->file_name);
-        else
-            displaytitle = vorbis_http_get_title(filename);
+        displaytitle = g_strdup(input->file_name);
     }
 
     bmp_title_input_free(input);