diff src/mpg123/mpg123.c @ 223:12346b051297 trunk

[svn] - fix tuple breakage
author nenolod
date Sun, 05 Nov 2006 12:36:34 -0800
parents eda9699e490e
children 6a512dedcfbe
line wrap: on
line diff
--- a/src/mpg123/mpg123.c	Sun Nov 05 12:31:33 2006 -0800
+++ b/src/mpg123/mpg123.c	Sun Nov 05 12:36:34 2006 -0800
@@ -349,11 +349,7 @@
 {
     gchar *ext = strrchr(filename, '.');
 
-    if ((!strncasecmp(filename, "http://", 7)
-#ifdef HAVE_NEMESI
- || !strncasecmp(filename, "rtsp://", 7)
-#endif
-         ) &&
+    if (CHECK_STREAM_URI(filename) &&
         (ext && strncasecmp(ext, ".ogg", 4)) &&
         (ext && strncasecmp(ext, ".flac", 5)))
 	return TRUE;
@@ -630,7 +626,7 @@
     /*
      * TODO: Getting song info from http streams.
      */
-    if (CHECK_STREAM(filename))
+    if (CHECK_STREAM_URI(filename))
         return;
 
     if ((tuple = get_song_tuple(filename)) != NULL) {
@@ -768,7 +764,7 @@
 
         mpgdec_length = mpgdec_info->num_frames * mpgdec_info->tpf * 1000;
 
-        if (mpgdec_info->filesize == 0) {
+        if (mpgdec_info->filesize != 0) {
 	    TitleInput *tuple = NULL;
             if (!mpgdec_title)
 	    {