Diffstat (limited to 'core/multimedia/opieplayer/libmad') (more/less context) (ignore whitespace changes)
-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 | |||
4 | layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h | 4 | layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h |
5 | SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ | 5 | SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ |
6 | layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp | 6 | network.c layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp |
7 | TARGET = madplugin | 7 | TARGET = madplugin |
8 | DESTDIR = ../../../plugins/codecs | 8 | DESTDIR = $(OPIEDIR)/plugins/codecs |
9 | INCLUDEPATH += $(OPIEDIR)/include .. | 9 | INCLUDEPATH += $(OPIEDIR)/include .. |
10 | DEPENDPATH += ../$(OPIEDIR)/include .. | 10 | 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 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qapplication.h> | ||
21 | #include <qpe/config.h> | ||
22 | #include <qmessagebox.h> | ||
23 | #include <qstring.h> | ||
24 | |||
25 | #include <stdio.h> | 20 | #include <stdio.h> |
26 | #include <stdarg.h> | 21 | #include <stdarg.h> |
@@ -37,5 +32,6 @@ | |||
37 | #include <math.h> | 32 | #include <math.h> |
38 | #include <assert.h> | 33 | #include <assert.h> |
39 | 34 | #include <qapplication.h> | |
35 | #include <qpe/config.h> | ||
40 | 36 | ||
41 | // for network handling | 37 | // for network handling |
@@ -238,5 +234,4 @@ int LibMadPlugin::http_read_line(int tcp_sock, char *buf, int size) { | |||
238 | 234 | ||
239 | int LibMadPlugin::http_open(const QString& path ) { | 235 | int LibMadPlugin::http_open(const QString& path ) { |
240 | qDebug("Open http"); | ||
241 | char *host; | 236 | char *host; |
242 | int port; | 237 | int port; |
@@ -245,25 +240,16 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
245 | char http_request[PATH_MAX]; | 240 | char http_request[PATH_MAX]; |
246 | char filename[PATH_MAX]; | 241 | char filename[PATH_MAX]; |
247 | // char c; | 242 | char c; |
248 | char *arg =strdup(path.latin1()); | 243 | char *arg =strdup(path.latin1()); |
249 | 244 | ||
250 | QString errorMsg; | ||
251 | |||
252 | /* Check for URL syntax */ | 245 | /* Check for URL syntax */ |
253 | // if (strncmp(arg, "http://", strlen("http://"))) { | 246 | if (strncmp(arg, "http://", strlen("http://"))) |
254 | // qDebug("Url syntax error"); | 247 | return (0); |
255 | // return (0); | ||
256 | // } | ||
257 | 248 | ||
258 | qDebug("Parse URL"); | 249 | /* Parse URL */ |
259 | port = 80; | 250 | port = 80; |
260 | host = arg + strlen("http://"); | 251 | host = arg + strlen("http://"); |
261 | 252 | if ((request = strchr(host, '/')) == NULL) | |
262 | // we need to think of something better than that | 253 | return (0); |
263 | //if ((request = strchr(host, '/')) == NULL) { | ||
264 | // qDebug("Url syntax 2error %s", host); | ||
265 | // return (0); | ||
266 | // } | ||
267 | |||
268 | *request++ = 0; | 254 | *request++ = 0; |
269 | 255 | ||
@@ -274,9 +260,8 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
274 | } | 260 | } |
275 | 261 | ||
276 | qDebug("Open a TCP socket"); | 262 | /* Open a TCP socket */ |
277 | if (!(tcp_sock = tcp_open(host, port))) { | 263 | if (!(tcp_sock = tcp_open(host, port))) |
278 | perror("http_open"); | 264 | { |
279 | errorMsg="http_open "+(QString)strerror(errno); | 265 | perror("http_open"); |
280 | QMessageBox::message("OPiePlayer",errorMsg); | ||
281 | return (0); | 266 | return (0); |
282 | } | 267 | } |
@@ -290,10 +275,9 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
290 | /* "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */ | 275 | /* "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */ |
291 | "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host); | 276 | "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host); |
292 | qDebug("send"); | 277 | |
293 | send(tcp_sock, http_request, strlen(http_request), 0); | 278 | send(tcp_sock, http_request, strlen(http_request), 0); |
294 | 279 | ||
295 | qDebug("Parse server reply"); | 280 | /* Parse server reply */ |
296 | #if 0 | 281 | #if 0 |
297 | qDebug("do 0"); | ||
298 | do | 282 | do |
299 | read(tcp_sock, &c, sizeof(char)); | 283 | read(tcp_sock, &c, sizeof(char)); |
@@ -329,5 +313,5 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
329 | if (strncmp(http_request, "Location:", 9) == 0) | 313 | if (strncmp(http_request, "Location:", 9) == 0) |
330 | { | 314 | { |
331 | qDebug("redirect"); | 315 | /* redirect */ |
332 | std::close(tcp_sock); | 316 | std::close(tcp_sock); |
333 | 317 | ||
@@ -339,5 +323,5 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
339 | if (strncmp(http_request, "ICY ", 4) == 0) | 323 | if (strncmp(http_request, "ICY ", 4) == 0) |
340 | { | 324 | { |
341 | qDebug(" This is icecast streaming"); | 325 | /* This is icecast streaming */ |
342 | if (strncmp(http_request + 4, "200 ", 4)) | 326 | if (strncmp(http_request + 4, "200 ", 4)) |
343 | { | 327 | { |
@@ -361,5 +345,5 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
361 | bool LibMadPlugin::open( const QString& path ) { | 345 | bool LibMadPlugin::open( const QString& path ) { |
362 | debugMsg( "LibMadPlugin::open" ); | 346 | debugMsg( "LibMadPlugin::open" ); |
363 | Config cfg("OpiePlayer"); | 347 | Config cfg("MediaPlayer"); |
364 | cfg.setGroup("Options"); | 348 | cfg.setGroup("Options"); |
365 | bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE); | 349 | bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE); |
@@ -369,14 +353,9 @@ bool LibMadPlugin::open( const QString& path ) { | |||
369 | info = QString( "" ); | 353 | info = QString( "" ); |
370 | 354 | ||
371 | qDebug( "Opening %s", path.latin1() ); | 355 | //qDebug( "Opening %s", path.latin1() ); |
356 | |||
372 | 357 | ||
373 | bool isStream=FALSE; | ||
374 | if (path.left( 4 ) == "http" ) { | 358 | if (path.left( 4 ) == "http" ) { |
375 | d->input.fd = http_open(path); | 359 | d->input.fd = http_open(path); |
376 | if(d->input.fd == 0) { | ||
377 | qDebug("http_open error"); | ||
378 | } | ||
379 | isStream=TRUE; | ||
380 | qDebug("Opened ok"); | ||
381 | 360 | ||
382 | } else { | 361 | } else { |
@@ -388,8 +367,6 @@ bool LibMadPlugin::open( const QString& path ) { | |||
388 | return FALSE; | 367 | return FALSE; |
389 | } | 368 | } |
390 | if(!isStream) { | 369 | |
391 | qDebug("Print ID#tags"); | 370 | printID3Tags(); |
392 | printID3Tags(); | ||
393 | } | ||
394 | 371 | ||
395 | #if defined(HAVE_MMAP) | 372 | #if defined(HAVE_MMAP) |
@@ -419,9 +396,6 @@ bool LibMadPlugin::open( const QString& path ) { | |||
419 | d->input.eof = 0; | 396 | d->input.eof = 0; |
420 | 397 | ||
421 | qDebug("about to mad_stream"); | ||
422 | mad_stream_init(&d->stream); | 398 | mad_stream_init(&d->stream); |
423 | qDebug("mad_frame"); | ||
424 | mad_frame_init(&d->frame); | 399 | mad_frame_init(&d->frame); |
425 | qDebug("mad_synth"); | ||
426 | mad_synth_init(&d->synth); | 400 | mad_synth_init(&d->synth); |
427 | 401 | ||