- Shoutcast packet handling cleanup.

- Support streaming of NSV files.
  test streams:
    hTtP://xxx.inlive.co.kr:8000/;stream.nsv
    http://lsac1-0-s01.shoutcast.net:8012/;file.nsv
- Remove an old hack to force mpeg audio demuxer selection.

CVS patchset: 6484
CVS date: 2004/05/04 22:26:13

1 files changed, 4 insertions, 7 deletions

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 7a7f21736..7ff17bd7a 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpgaudio.c,v 1.135 2004/04/22 00:37:52 miguelfreitas Exp $
+ * $Id: demux_mpgaudio.c,v 1.136 2004/05/04 22:26:13 tmattern Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -922,16 +922,13 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   case METHOD_BY_EXTENSION: {
     char *mrl = input->get_mrl(input);
+    char *extensions = class_gen->get_extensions (class_gen);
     
     lprintf ("stage by extension %s\n", mrl);
     
-    if (strncmp (mrl, "ice :/", 6)) {
-      char *extensions = class_gen->get_extensions (class_gen);
-      
-      if (!_x_demux_check_extension (mrl, extensions))
-  	return NULL;
+    if (!_x_demux_check_extension (mrl, extensions))
+      return NULL;
       
-    }
   }
   break;