-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 0f952f4..8b692ef 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp | |||
@@ -309,9 +309,9 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
309 | char *request; | 309 | char *request; |
310 | int tcp_sock; | 310 | int tcp_sock; |
311 | char http_request[PATH_MAX]; | 311 | char http_request[PATH_MAX]; |
312 | char filename[PATH_MAX]; | 312 | char filename[PATH_MAX]; |
313 | char c; | 313 | //char c; |
314 | char *arg =strdup(path.latin1()); | 314 | char *arg =strdup(path.latin1()); |
315 | 315 | ||
316 | /* Check for URL syntax */ | 316 | /* Check for URL syntax */ |
317 | if (strncmp(arg, "http://", strlen("http://"))) { | 317 | if (strncmp(arg, "http://", strlen("http://"))) { |
@@ -371,36 +371,33 @@ int LibMadPlugin::http_open(const QString& path ) { | |||
371 | QString genre; | 371 | QString genre; |
372 | QString bitrate; | 372 | QString bitrate; |
373 | QString url; | 373 | QString url; |
374 | QString message = tr("Info: "); | 374 | QString message = tr("Info: "); |
375 | |||
376 | do { | 375 | do { |
377 | 376 | ||
378 | int len; | 377 | int len; |
379 | 378 | ||
380 | len = http_read_line(tcp_sock, http_request, sizeof(http_request)); | 379 | len = http_read_line(tcp_sock, http_request, sizeof(http_request)); |
381 | 380 | ||
382 | if (len == -1) { | 381 | if (len == -1) { |
383 | fprintf(stderr, "http_open: %s\n", strerror(errno)); | 382 | qDebug( "http_open: "+ QString(strerror(errno)) +"\n"); |
384 | return 0; | 383 | return 0; |
385 | } | 384 | } |
386 | 385 | ||
387 | if (strncmp(http_request, "Location:", 9) == 0) { | 386 | if (QString(http_request).left(9) == "Location:") { |
388 | /* redirect */ | 387 | /* redirect */ |
389 | std::close(tcp_sock); | 388 | std::close(tcp_sock); |
390 | |||
391 | http_request[strlen(http_request) - 1] = '\0'; | 389 | http_request[strlen(http_request) - 1] = '\0'; |
392 | |||
393 | return http_open(&http_request[10]); | 390 | return http_open(&http_request[10]); |
394 | } | 391 | } |
395 | 392 | ||
396 | if (strncmp(http_request, "ICY ", 4) == 0) { | 393 | if (QString(http_request).left(4) == "ICY ") { |
397 | /* This is icecast streaming */ | 394 | /* This is shoutcast/icecast streaming */ |
398 | if (strncmp(http_request + 4, "200 ", 4)) { | 395 | if (strncmp(http_request + 4, "200 ", 4)) { |
399 | fprintf(stderr, "http_open: %s\n", http_request); | 396 | qDebug("http_open: " + QString(http_request) + "\n"); |
400 | return 0; | 397 | return 0; |
401 | } | 398 | } |
402 | } else if (strncmp(http_request, "icy-", 4) == 0) { | 399 | } else if (QString(http_request).left(4) == "icy-") { |
403 | /* we can have: icy-noticeX, icy-name, icy-genre, icy-url, icy-pub, icy-metaint, icy-br */ | 400 | /* we can have: icy-noticeX, icy-name, icy-genre, icy-url, icy-pub, icy-metaint, icy-br */ |
404 | if ( QString( http_request ).left( 8 ) == "icy-name" ) { | 401 | if ( QString( http_request ).left( 8 ) == "icy-name" ) { |
405 | name = tr("Name: ") + QString(http_request).mid(9, (QString(http_request).length())- 9 ); | 402 | name = tr("Name: ") + QString(http_request).mid(9, (QString(http_request).length())- 9 ); |
406 | } else if ( QString( http_request ).left( 9 ) == "icy-genre" ) { | 403 | } else if ( QString( http_request ).left( 9 ) == "icy-genre" ) { |