changeset 1661:a588ea8ec873 trunk

[svn] Non-RTSP should compile too, ktnxbye.
author chainsaw
date Sun, 10 Sep 2006 06:40:15 -0700
parents 4c72daee66e3
children f9593a065464
files ChangeLog Plugins/Input/mpg123/common.c
diffstat 2 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Sep 09 21:52:25 2006 -0700
+++ b/ChangeLog	Sun Sep 10 06:40:15 2006 -0700
@@ -1,3 +1,18 @@
+2006-09-10 04:52:25 +0000  
+  revision [2257]
+  rtsp support in mp3
+
+  Changes:        Modified:
+  +3 -3           trunk/Plugins/Input/mpg123/Makefile.in  
+  +37 -5          trunk/Plugins/Input/mpg123/common.c  
+  +7 -5           trunk/Plugins/Input/mpg123/mpg123.c  
+  +19 -0          trunk/Plugins/Input/mpg123/mpg123.h  
+  +108 -0         trunk/Plugins/Input/mpg123/rtsp.c  
+  +1 -0           trunk/audacious/credits.c  
+  +8 -1           trunk/configure.ac  
+  +3 -0           trunk/mk/rules.mk.in  
+
+
 2006-09-10 01:04:36 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2255]
   Make the playback resume code a lot more robust.
--- a/Plugins/Input/mpg123/common.c	Sat Sep 09 21:52:25 2006 -0700
+++ b/Plugins/Input/mpg123/common.c	Sun Sep 10 06:40:15 2006 -0700
@@ -400,8 +400,10 @@
         mpgdec_info->network_stream = TRUE;
         mpgdec_info->stream_type = STREAM_RTSP;
         if (mpgdec_rtsp_open(bs_filenam)) mpgdec_info->eof = TRUE;
+    } else {
+#else
+    {
 #endif
-    } else {
         if ((filept = vfs_fopen(bs_filenam, "rb")) == NULL ||
             stream_init() == -1)
             mpgdec_info->eof = TRUE;