http streaming

2 files changed, 42 insertions, 19 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index eddf242..679242b 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,16 +1,16 @@
 TEMPLATE  =   lib
 CONFIG    +=  qt warn_on release
 HEADERS   =   libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
         layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
 SOURCES         =   version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
         layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
 TARGET    =   madplugin
-DESTDIR   =   ../../plugins/codecs
+DESTDIR   =   ../../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lm
 VERSION   =   1.0.0
 
 TRANSLATIONS    = ../../i18n/pt_BR/libmadplugin.ts
 TRANSLATIONS   += ../../i18n/de/libmadplugin.ts
 TRANSLATIONS   += ../../i18n/en/libmadplugin.ts
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 46f2450..4665408 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -12,32 +12,36 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#include <qapplication.h>
+#include <qpe/config.h>
+#include <qmessagebox.h>
+#include <qstring.h>
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <time.h>
 #include <locale.h>
 #include <math.h>
 #include <assert.h>
-#include <qapplication.h>
-#include <qpe/config.h>
+
 
 // for network handling
 #include <netinet/in.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <unistd.h>
 
@@ -228,62 +232,71 @@ int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) {
     }
     while (offset < size - 1 && buf[offset - 1] != '\n');
 
     buf[offset] = 0;
     return offset;
 }
 
 int LibMadPlugin::http_open(const QString& path ) {
+    qDebug("Open http");
     char *host;
     int port;
     char *request;
     int tcp_sock;
     char http_request[PATH_MAX];
     char filename[PATH_MAX];
     char c;
     char *arg =strdup(path.latin1());
 
+    QString errorMsg;
+
     /* Check for URL syntax */
-    if (strncmp(arg, "http://", strlen("http://")))
-        return (0);
+//     if (strncmp(arg, "http://", strlen("http://"))) {
+//         qDebug("Url syntax error");
+//         return (0);
+//     }
 
-    /* Parse URL */
+    qDebug("Parse URL");
     port = 80;
     host = arg + strlen("http://");
-    if ((request = strchr(host, '/')) == NULL)
+    if ((request = strchr(host, '/')) == NULL) {
+        qDebug("Url syntax 2error %s", host);
         return (0);
+    }
     *request++ = 0;
 
     if (strchr(host, ':') != NULL)  /* port is specified */
     {
         port = atoi(strchr(host, ':') + 1);
         *strchr(host, ':') = 0;
     }
 
-    /* Open a TCP socket */
-    if (!(tcp_sock = tcp_open(host, port)))
-    {
-        perror("http_open");
+    qDebug("Open a TCP socket");
+    if (!(tcp_sock = tcp_open(host, port)))  {
+       perror("http_open");
+       errorMsg="http_open "+(QString)strerror(errno);
+       QMessageBox::message("OPiePlayer",errorMsg);
         return (0);
     }
 
     snprintf(filename, sizeof(filename) - strlen(host) - 75, "%s", request);
 
     /* Send HTTP GET request */
     /* Please don't use a Agent know by shoutcast (Lynx, Mozilla) seems to be reconized and print
      * a html page and not the stream */
     snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n"
 /*  "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */
              "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host);
-
+    qDebug("send");
     send(tcp_sock, http_request, strlen(http_request), 0);
 
-    /* Parse server reply */
+    qDebug("Parse server reply");
 #if 0
+    qDebug("do 0");
     do
         read(tcp_sock, &c, sizeof(char));
     while (c != ' ');
     read(tcp_sock, http_request, 4 * sizeof(char));
     http_request[4] = 0;
     if (strcmp(http_request, "200 "))
     {
         fprintf(stderr, "http_open: ");
@@ -307,27 +320,27 @@ int LibMadPlugin::http_open(const QString& path ) {
         if (len == -1)
         {
             fprintf(stderr, "http_open: %s\n", strerror(errno));
             return 0;
         }
 
         if (strncmp(http_request, "Location:", 9) == 0)
         {
-            /* redirect */
+            qDebug("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 */
+            qDebug(" This is icecast streaming");
             if (strncmp(http_request + 4, "200 ", 4))
             {
                 fprintf(stderr, "http_open: %s\n", http_request);
                 return 0;
             }
         }
         else if (strncmp(http_request, "icy-", 4) == 0)
         {
@@ -347,32 +360,39 @@ bool LibMadPlugin::open( const QString& path ) {
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
     qDebug("buffer size is %d", bufferSize);
     d->bad_last_frame = 0;
     d->flush = TRUE;
     info = QString( "" );
 
-    //qDebug( "Opening %s", path.latin1() );
-
+    qDebug( "Opening %s", path.latin1() );
 
+    bool isStream=FALSE;
     if (path.left( 4 ) == "http" ) {
         d->input.fd = http_open(path);
+        if(d->input.fd == 0) {
+            qDebug("http_open error");
+        }
+        isStream=TRUE;
+       qDebug("Opened ok");
 
     } else {
         d->input.path = path.latin1();
         d->input.fd = ::open( d->input.path, O_RDONLY );
     }
     if (d->input.fd == -1) {
         qDebug("error opening %s", d->input.path );
   return FALSE;
     }
-
-    printID3Tags();
+    if(!isStream) {
+        qDebug("Print ID#tags");
+        printID3Tags();
+    }
 
 #if defined(HAVE_MMAP)
     struct stat stat;
     if (fstat(d->input.fd, &stat) == -1) {
   qDebug("error calling fstat"); return FALSE;
     }
     if (S_ISREG(stat.st_mode) && stat.st_size > 0) {
   d->input.length = stat.st_size;
@@ -390,18 +410,21 @@ bool LibMadPlugin::open( const QString& path ) {
       qDebug("error allocating input buffer");
       return FALSE;
   }
   d->input.length = 0;
     }
 
     d->input.eof = 0;
 
+qDebug("about to mad_stream");
     mad_stream_init(&d->stream);
+qDebug("mad_frame");
     mad_frame_init(&d->frame);
+qDebug("mad_synth");
     mad_synth_init(&d->synth);
 
     return TRUE;
 }
 
 
 bool LibMadPlugin::close() {
     debugMsg( "LibMadPlugin::close" );