summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-05-23 20:36:26 (UTC)
committer harlekin <harlekin>2002-05-23 20:36:26 (UTC)
commitf44fc6d458a116b7f932f1c7628d53557f5183d3 (patch) (side-by-side diff)
treee6b4dea86309c2c4d82ad0db1dd8a0d4047bd1fe
parent582f7e6b7da49b90d2cfccd638bccd4ca279da37 (diff)
downloadopie-f44fc6d458a116b7f932f1c7628d53557f5183d3.zip
opie-f44fc6d458a116b7f932f1c7628d53557f5183d3.tar.gz
opie-f44fc6d458a116b7f932f1c7628d53557f5183d3.tar.bz2
include #include <linux/limits.h> reagrding PATH_MAX build problem
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.cpp10
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
@@ -22,48 +22,49 @@
#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 <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"
extern "C" {
#include "mad.h"
}
#define MPEG_BUFFER_SIZE 65536
//#define MPEG_BUFFER_SIZE 32768 //16384 // 8192
//#define debugMsg(a) qDebug(a)
#define debugMsg(a)
@@ -413,73 +414,66 @@ int LibMadPlugin::http_open(const QString& path ) {
}
} while (strcmp(http_request, "\n") != 0);
info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " );
qDebug("Stream info: " + info);
return (tcp_sock);
}
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;
}
#endif
if (d->input.data == 0) {
d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/);
if (d->input.data == 0) {
qDebug("error allocating input buffer");
return FALSE;
}
d->input.length = 0;
}