| -rw-r--r-- | core/multimedia/opieplayer/libmad/libmad.pro | 4 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 64 |
2 files changed, 21 insertions, 47 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 @@ -3,9 +3,9 @@ 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 + 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 .. LIBS += -lqpe -lm 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 @@ -17,11 +17,6 @@ ** 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> @@ -36,7 +31,8 @@ #include <locale.h> #include <math.h> #include <assert.h> - +#include <qapplication.h> +#include <qpe/config.h> // for network handling #include <netinet/in.h> @@ -237,34 +233,24 @@ 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; char *request; int tcp_sock; 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; if (strchr(host, ':') != NULL) /* port is specified */ @@ -273,11 +259,10 @@ int LibMadPlugin::http_open(const QString& path ) { *strchr(host, ':') = 0; } - qDebug("Open a TCP socket"); - if (!(tcp_sock = tcp_open(host, port))) { + /* 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); } @@ -289,12 +274,11 @@ int LibMadPlugin::http_open(const QString& path ) { 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); - qDebug("Parse server reply"); + /* Parse server reply */ #if 0 - qDebug("do 0"); do read(tcp_sock, &c, sizeof(char)); while (c != ' '); @@ -328,7 +312,7 @@ int LibMadPlugin::http_open(const QString& path ) { if (strncmp(http_request, "Location:", 9) == 0) { - qDebug("redirect"); + /* redirect */ std::close(tcp_sock); http_request[strlen(http_request) - 1] = '\0'; @@ -338,7 +322,7 @@ 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)) { fprintf(stderr, "http_open: %s\n", http_request); @@ -360,7 +344,7 @@ 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); qDebug("buffer size is %d", bufferSize); @@ -368,16 +352,11 @@ bool LibMadPlugin::open( const QString& path ) { 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(); @@ -387,10 +366,8 @@ bool LibMadPlugin::open( const QString& path ) { qDebug("error opening %s", d->input.path ); return FALSE; } - if(!isStream) { - qDebug("Print ID#tags"); + printID3Tags(); - } #if defined(HAVE_MMAP) struct stat stat; @@ -418,11 +395,8 @@ 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); return TRUE; |