summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-04-23 00:04:57 (UTC)
committer llornkcor <llornkcor>2002-04-23 00:04:57 (UTC)
commit228dffdc2721ee13ca9491584d8cc46cd4807cc1 (patch) (unidiff)
treeb0431ae74b7a64272748899c556165d194a09740
parentb3190f8be01fb364f89d9de0a0dddb9a5ccebe77 (diff)
downloadopie-228dffdc2721ee13ca9491584d8cc46cd4807cc1.zip
opie-228dffdc2721ee13ca9491584d8cc46cd4807cc1.tar.gz
opie-228dffdc2721ee13ca9491584d8cc46cd4807cc1.tar.bz2
config fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmadplugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index c744c6d..319e0ff 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -394,65 +394,65 @@ int LibMadPlugin::http_open(const QString& path ) {
394 /* This is shoutcast/icecast streaming */ 394 /* This is shoutcast/icecast streaming */
395 if (strncmp(http_request + 4, "200 ", 4)) { 395 if (strncmp(http_request + 4, "200 ", 4)) {
396 qDebug("http_open: " + QString(http_request) + "\n"); 396 qDebug("http_open: " + QString(http_request) + "\n");
397 return 0; 397 return 0;
398 } 398 }
399 } else if (QString(http_request).left(4) == "icy-") { 399 } else if (QString(http_request).left(4) == "icy-") {
400 /* 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 */
401 if ( QString( http_request ).left( 8 ) == "icy-name" ) { 401 if ( QString( http_request ).left( 8 ) == "icy-name" ) {
402 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 );
403 } else if ( QString( http_request ).left( 9 ) == "icy-genre" ) { 403 } else if ( QString( http_request ).left( 9 ) == "icy-genre" ) {
404 genre = tr("Genre: ") + QString(http_request).mid(10, (QString(http_request).length())-10 ); 404 genre = tr("Genre: ") + QString(http_request).mid(10, (QString(http_request).length())-10 );
405 } else if ( QString( http_request ).left( 6 ) == "icy-br" ) { 405 } else if ( QString( http_request ).left( 6 ) == "icy-br" ) {
406 bitrate = tr("Bitrate: ") + QString(http_request).mid(7, (QString(http_request).length())- 7 ); 406 bitrate = tr("Bitrate: ") + QString(http_request).mid(7, (QString(http_request).length())- 7 );
407 } else if ( QString( http_request ).left( 7 ) == "icy-url" ) { 407 } else if ( QString( http_request ).left( 7 ) == "icy-url" ) {
408 url = tr("URL: ") + QString(http_request).mid(8, (QString(http_request).length())- 8 ); 408 url = tr("URL: ") + QString(http_request).mid(8, (QString(http_request).length())- 8 );
409 } else if ( QString( http_request ).left( 10 ) == "icy-notice" ) { 409 } else if ( QString( http_request ).left( 10 ) == "icy-notice" ) {
410 message += QString(http_request).mid(11, QString(http_request).length()-11 ) ; 410 message += QString(http_request).mid(11, QString(http_request).length()-11 ) ;
411 } 411 }
412 } 412 }
413 } while (strcmp(http_request, "\n") != 0); 413 } while (strcmp(http_request, "\n") != 0);
414 414
415 info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " ); 415 info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " );
416 416
417 qDebug("Stream info: " + info); 417 qDebug("Stream info: " + info);
418 418
419 return (tcp_sock); 419 return (tcp_sock);
420} 420}
421 421
422 422
423 423
424bool LibMadPlugin::open( const QString& path ) { 424bool LibMadPlugin::open( const QString& path ) {
425 debugMsg( "LibMadPlugin::open" ); 425 debugMsg( "LibMadPlugin::open" );
426 Config cfg("MediaPlayer"); 426 Config cfg("OpiePlayer");
427 cfg.setGroup("Options"); 427 cfg.setGroup("Options");
428 bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE); 428 bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
429 qDebug("buffer size is %d", bufferSize); 429 qDebug("buffer size is %d", bufferSize);
430 d->bad_last_frame = 0; 430 d->bad_last_frame = 0;
431 d->flush = TRUE; 431 d->flush = TRUE;
432 info = QString( "" ); 432 info = QString( "" );
433 433
434 //qDebug( "Opening %s", path.latin1() ); 434 //qDebug( "Opening %s", path.latin1() );
435 435
436 436
437 if (path.left( 4 ) == "http" ) { 437 if (path.left( 4 ) == "http" ) {
438 qDebug("Test2"); 438 qDebug("Test2");
439 // in case of any error we get 0 here 439 // in case of any error we get 0 here
440 if ( !(http_open(path) == 0) ) { 440 if ( !(http_open(path) == 0) ) {
441 qDebug("Test3"); 441 qDebug("Test3");
442 d->input.fd = http_open(path); 442 d->input.fd = http_open(path);
443 } else { 443 } else {
444 qDebug("Test5"); 444 qDebug("Test5");
445 return FALSE; 445 return FALSE;
446 } 446 }
447 } else { 447 } else {
448 qDebug("Test4"); 448 qDebug("Test4");
449 d->input.path = path.latin1(); 449 d->input.path = path.latin1();
450 d->input.fd = ::open( d->input.path, O_RDONLY ); 450 d->input.fd = ::open( d->input.path, O_RDONLY );
451 // thats a better place, since it should only seek for ID3 tags on mp3 files, not streams 451 // thats a better place, since it should only seek for ID3 tags on mp3 files, not streams
452 printID3Tags(); 452 printID3Tags();
453 } 453 }
454 if (d->input.fd == -1) { 454 if (d->input.fd == -1) {
455 qDebug("error opening %s", d->input.path ); 455 qDebug("error opening %s", d->input.path );
456 return FALSE; 456 return FALSE;
457 } 457 }
458 458