| -rw-r--r-- | core/multimedia/opieplayer/libmad/libmad.pro | 4 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 68 |
2 files changed, 23 insertions, 49 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index 679242b..8278bf0 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro @@ -4,7 +4,7 @@ HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h de 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 + network.c layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp TARGET = madplugin -DESTDIR = ../../../plugins/codecs +DESTDIR = $(OPIEDIR)/plugins/codecs INCLUDEPATH += $(OPIEDIR)/include .. DEPENDPATH += ../$(OPIEDIR)/include .. diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 7978805..7bb6541 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp @@ -18,9 +18,4 @@ ** **********************************************************************/ -#include <qapplication.h> -#include <qpe/config.h> -#include <qmessagebox.h> -#include <qstring.h> - #include <stdio.h> #include <stdarg.h> @@ -37,5 +32,6 @@ #include <math.h> #include <assert.h> - +#include <qapplication.h> +#include <qpe/config.h> // for network handling @@ -238,5 +234,4 @@ int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) { int LibMadPlugin::http_open(const QString& path ) { - qDebug("Open http"); char *host; int port; @@ -245,25 +240,16 @@ int LibMadPlugin::http_open(const QString& path ) { char http_request[PATH_MAX]; char filename[PATH_MAX]; - // char c; + char c; char *arg =strdup(path.latin1()); - QString errorMsg; - /* Check for URL syntax */ -// if (strncmp(arg, "http://", strlen("http://"))) { -// qDebug("Url syntax error"); -// return (0); -// } + if (strncmp(arg, "http://", strlen("http://"))) + return (0); - qDebug("Parse URL"); + /* Parse URL */ port = 80; host = arg + strlen("http://"); - - // we need to think of something better than that - //if ((request = strchr(host, '/')) == NULL) { - // qDebug("Url syntax 2error %s", host); - // return (0); - // } - + if ((request = strchr(host, '/')) == NULL) + return (0); *request++ = 0; @@ -274,9 +260,8 @@ int LibMadPlugin::http_open(const QString& path ) { } - 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); + /* Open a TCP socket */ + if (!(tcp_sock = tcp_open(host, port))) + { + perror("http_open"); return (0); } @@ -290,10 +275,9 @@ int LibMadPlugin::http_open(const QString& path ) { /* "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); - qDebug("Parse server reply"); + /* Parse server reply */ #if 0 - qDebug("do 0"); do read(tcp_sock, &c, sizeof(char)); @@ -329,5 +313,5 @@ int LibMadPlugin::http_open(const QString& path ) { if (strncmp(http_request, "Location:", 9) == 0) { - qDebug("redirect"); + /* redirect */ std::close(tcp_sock); @@ -339,5 +323,5 @@ int LibMadPlugin::http_open(const QString& path ) { if (strncmp(http_request, "ICY ", 4) == 0) { - qDebug(" This is icecast streaming"); + /* This is icecast streaming */ if (strncmp(http_request + 4, "200 ", 4)) { @@ -361,5 +345,5 @@ int LibMadPlugin::http_open(const QString& path ) { bool LibMadPlugin::open( const QString& path ) { debugMsg( "LibMadPlugin::open" ); - Config cfg("OpiePlayer"); + Config cfg("MediaPlayer"); cfg.setGroup("Options"); bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE); @@ -369,14 +353,9 @@ bool LibMadPlugin::open( const QString& path ) { 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 { @@ -388,8 +367,6 @@ bool LibMadPlugin::open( const QString& path ) { return FALSE; } - if(!isStream) { - qDebug("Print ID#tags"); - printID3Tags(); - } + + printID3Tags(); #if defined(HAVE_MMAP) @@ -419,9 +396,6 @@ bool LibMadPlugin::open( const QString& path ) { 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); |