# HG changeset patch
# User iabervon
# Date 1168842676 28800
# Node ID 88c73db9a4b49c482f83b6640562f75dd2931cc2
# Parent  31374f2836114a5104a3c185f982c3cf6f0b8464
[svn] Use a VFSFile instead of the built-in http, if the VFS supports it.

diff -r 31374f283611 -r 88c73db9a4b4 ChangeLog
--- a/ChangeLog	Sun Jan 14 19:32:17 2007 -0800
+++ b/ChangeLog	Sun Jan 14 22:31:16 2007 -0800
@@ -1,3 +1,11 @@
+2007-01-15 03:32:17 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [936]
+  - fix dependency generation
+  
+  trunk/src/console/Makefile |    1 +
+  1 file changed, 1 insertion(+)
+
+
 2007-01-15 03:04:03 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [934]
   - fix dependency generation (CFLAGS was not set)
diff -r 31374f283611 -r 88c73db9a4b4 src/mpg123/common.c
--- a/src/mpg123/common.c	Sun Jan 14 19:32:17 2007 -0800
+++ b/src/mpg123/common.c	Sun Jan 14 22:31:16 2007 -0800
@@ -402,14 +402,10 @@
 mpgdec_open_stream(char *bs_filenam, int fd, unsigned long range)
 {
     filept_opened = 1;
-    if (!strncasecmp(bs_filenam, "http://", 7)) {
-        filept = NULL;
-        mpgdec_http_open(bs_filenam, range);
-        mpgdec_info->filesize = 0;
-        mpgdec_info->network_stream = TRUE;
-        mpgdec_info->stream_type = STREAM_HTTP;
-    } 
-    else
+    filept = vfs_fopen(bs_filenam, "rb");
+    if (filept != NULL) {
+        if (stream_init() == -1) mpgdec_info->eof = TRUE;
+    } else
 #ifdef HAVE_NEMESI
     if (!strncasecmp(bs_filenam, "rtsp://", 7)) {
         filept = NULL;
@@ -417,15 +413,20 @@
         mpgdec_info->network_stream = TRUE;
         mpgdec_info->stream_type = STREAM_RTSP;
         if (mpgdec_rtsp_open(bs_filenam)) mpgdec_info->eof = TRUE;
-    } else {
-#else
-    {
+    } else 
 #endif
-        if ((filept = vfs_fopen(bs_filenam, "rb")) == NULL ||
-            stream_init() == -1)
-            mpgdec_info->eof = TRUE;
+#if 1
+    if (!strncasecmp(bs_filenam, "http://", 7)) {
+        filept = NULL;
+        mpgdec_http_open(bs_filenam, range);
+        mpgdec_info->filesize = 0;
+        mpgdec_info->network_stream = TRUE;
+        mpgdec_info->stream_type = STREAM_HTTP;
+    } else
+#endif
+    {
+        mpgdec_info->eof = TRUE;
     }
-
 }
 
 void