-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 3df23249..9a1ab2a 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp @@ -34,24 +34,25 @@ #include <math.h> #include <assert.h> #include <qapplication.h> #include <qmessagebox.h> #include <qregexp.h> #include <qpe/config.h> // for network handling #include <netinet/in.h> #include <netdb.h> +#include <linux/limits.h> #include <sys/socket.h> #include <arpa/inet.h> #include <unistd.h> //#define HAVE_MMAP #if defined(HAVE_MMAP) # include <sys/mman.h> #endif #include "libmadplugin.h" @@ -425,49 +426,42 @@ int LibMadPlugin::http_open(const QString& path ) { bool LibMadPlugin::open( const QString& path ) { debugMsg( "LibMadPlugin::open" ); 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() ); - if (path.left( 4 ) == "http" ) { - qDebug("Test2"); // in case of any error we get 0 here if ( !(http_open(path) == 0) ) { - qDebug("Test3"); d->input.fd = http_open(path); } else { - qDebug("Test5"); return FALSE; } } else { - qDebug("Test4"); d->input.path = path.latin1(); d->input.fd = ::open( d->input.path, O_RDONLY ); // thats a better place, since it should only seek for ID3 tags on mp3 files, not streams printID3Tags(); } if (d->input.fd == -1) { qDebug("error opening %s", d->input.path ); - return FALSE; + return FALSE; } -// 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; d->input.fdm = map_file(d->input.fd, &d->input.length); if (d->input.fdm == 0) { qDebug("error mmapping file"); return FALSE; } d->input.data = (unsigned char *)d->input.fdm; |