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
@@ -7,3 +7,3 @@ SOURCES         =   version.c fixed.c bit.c timer.c stream.c frame.c synth.c dec
 TARGET    =   madplugin
-DESTDIR   =   ../../plugins/codecs
+DESTDIR   =   ../../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
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
@@ -19,2 +19,7 @@
 **********************************************************************/
+#include <qapplication.h>
+#include <qpe/config.h>
+#include <qmessagebox.h>
+#include <qstring.h>
+
 #include <stdio.h>
@@ -33,4 +38,3 @@
 #include <assert.h>
-#include <qapplication.h>
-#include <qpe/config.h>
+
 
@@ -235,2 +239,3 @@ int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) {
 int LibMadPlugin::http_open(const QString& path ) {
+    qDebug("Open http");
     char *host;
@@ -244,11 +249,17 @@ int LibMadPlugin::http_open(const QString& path ) {
 
+    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;
@@ -261,6 +272,7 @@ int LibMadPlugin::http_open(const QString& path ) {
 
-    /* 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);
@@ -276,7 +288,8 @@ int LibMadPlugin::http_open(const QString& path ) {
              "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
@@ -314,3 +327,3 @@ int LibMadPlugin::http_open(const QString& path ) {
         {
-            /* redirect */
+            qDebug("redirect");
             std::close(tcp_sock);
@@ -324,3 +337,3 @@ int LibMadPlugin::http_open(const QString& path ) {
         {
-            /* This is icecast streaming */
+            qDebug(" This is icecast streaming");
             if (strncmp(http_request + 4, "200 ", 4))
@@ -354,7 +367,12 @@ bool LibMadPlugin::open( const QString& path ) {
 
-    //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");
 
@@ -368,4 +386,6 @@ bool LibMadPlugin::open( const QString& path ) {
     }
-
-    printID3Tags();
+    if(!isStream) {
+        qDebug("Print ID#tags");
+        printID3Tags();
+    }
 
@@ -397,4 +417,7 @@ bool LibMadPlugin::open( const QString& path ) {
 
+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);