1 files changed, 7 insertions, 10 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 0f952f4..8b692ef 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -297,33 +297,33 @@ int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) {
             return -1;
         if (buf[offset] != '\r')    /* Strip \r from answer */
             offset++;
     } while (offset < size - 1 && buf[offset - 1] != '\n');
 
     buf[offset] = 0;
     return offset;
 }
 
 int LibMadPlugin::http_open(const QString& path ) {
     char *host;
     int port;
     char *request;
     int tcp_sock;
     char http_request[PATH_MAX];
     char filename[PATH_MAX];
-    char c;
+    //char c;
     char *arg =strdup(path.latin1());
 
     /* Check for URL syntax */
     if (strncmp(arg, "http://", strlen("http://"))) {
         return (0);
     }
 
     /* Parse URL */
     port = 80;
     host = arg + strlen("http://");
     if ((request = strchr(host, '/')) == NULL) {
         return (0);
     }
 
     *request++ = 0;
 
@@ -359,60 +359,57 @@ int LibMadPlugin::http_open(const QString& path ) {
     if (strcmp(http_request, "200 "))     {
         fprintf(stderr, "http_open: ");
         do {
             read(tcp_sock, &c, sizeof(char));
             fprintf(stderr, "%c", c);
         } while (c != '\r');
         fprintf(stderr, "\n");
         return (0);
     }
 #endif
 
     QString name;
     QString genre;
     QString bitrate;
     QString url;
     QString message = tr("Info: ");
-
     do {
 
         int len;
 
         len = http_read_line(tcp_sock, http_request, sizeof(http_request));
 
         if (len == -1) {
-            fprintf(stderr, "http_open: %s\n", strerror(errno));
+            qDebug( "http_open: "+ QString(strerror(errno)) +"\n");
             return 0;
         }
 
-        if (strncmp(http_request, "Location:", 9) == 0) {
+        if (QString(http_request).left(9) == "Location:") {
             /* redirect */
             std::close(tcp_sock);
-
             http_request[strlen(http_request) - 1] = '\0';
-
             return http_open(&http_request[10]);
         }
 
-        if (strncmp(http_request, "ICY ", 4) == 0) {
-            /* This is icecast streaming */
+        if (QString(http_request).left(4) == "ICY ") {
+            /* This is shoutcast/icecast streaming */
             if (strncmp(http_request + 4, "200 ", 4)) {
-                fprintf(stderr, "http_open: %s\n", http_request);
+                qDebug("http_open: " + QString(http_request) + "\n");
                 return 0;
             }
-        } else if (strncmp(http_request, "icy-", 4) == 0) {
+        } else if (QString(http_request).left(4) == "icy-") {
             /* we can have: icy-noticeX, icy-name, icy-genre, icy-url, icy-pub, icy-metaint, icy-br */
             if ( QString( http_request ).left( 8 ) == "icy-name" ) {
                 name = tr("Name: ") + QString(http_request).mid(9, (QString(http_request).length())- 9 );
             } else if ( QString( http_request ).left( 9 ) == "icy-genre" ) {
                 genre = tr("Genre: ") + QString(http_request).mid(10, (QString(http_request).length())-10 );
             } else if ( QString( http_request ).left( 6 ) == "icy-br" ) {
                 bitrate = tr("Bitrate: ") + QString(http_request).mid(7, (QString(http_request).length())- 7 );
             } else if ( QString( http_request ).left( 7 ) == "icy-url" ) {
                 url = tr("URL: ") + QString(http_request).mid(8, (QString(http_request).length())- 8 );
             }  else if ( QString( http_request ).left( 10 ) == "icy-notice" ) {
                 message += QString(http_request).mid(11, QString(http_request).length()-11 ) ;
             }
         }
     } while (strcmp(http_request, "\n") != 0);
 
     info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " );