author | harlekin <harlekin> | 2002-04-22 22:28:33 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-04-22 22:28:33 (UTC) |
commit | 01ddcc2d67eb928eec6018e7e355820f2458b74f (patch) (unidiff) | |
tree | 25207e33fe281a07487e393f78c7686565811751 /core/multimedia/opieplayer | |
parent | 1ce5e1128e3c062d45e6dcfbcda20f195b4d5b13 (diff) | |
download | opie-01ddcc2d67eb928eec6018e7e355820f2458b74f.zip opie-01ddcc2d67eb928eec6018e7e355820f2458b74f.tar.gz opie-01ddcc2d67eb928eec6018e7e355820f2458b74f.tar.bz2 |
fixed to segfault in connection to shoutcast
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp index 8b692ef..c744c6d 100644 --- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp +++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp | |||
@@ -434,20 +434,26 @@ bool LibMadPlugin::open( const QString& path ) { | |||
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 | // in case of any error we get 0 here | 439 | // in case of any error we get 0 here |
439 | if ( !(http_open(path)==0) ) { | 440 | if ( !(http_open(path) == 0) ) { |
441 | qDebug("Test3"); | ||
440 | d->input.fd = http_open(path); | 442 | d->input.fd = http_open(path); |
443 | } else { | ||
444 | qDebug("Test5"); | ||
445 | return FALSE; | ||
441 | } | 446 | } |
442 | } else { | 447 | } else { |
448 | qDebug("Test4"); | ||
443 | d->input.path = path.latin1(); | 449 | d->input.path = path.latin1(); |
444 | d->input.fd = ::open( d->input.path, O_RDONLY ); | 450 | d->input.fd = ::open( d->input.path, O_RDONLY ); |
445 | // 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 |
446 | printID3Tags(); | 452 | printID3Tags(); |
447 | } | 453 | } |
448 | if (d->input.fd == -1) { | 454 | if (d->input.fd == -1) { |
449 | // qDebug("error opening %s", d->input.path ); | 455 | qDebug("error opening %s", d->input.path ); |
450 | return FALSE; | 456 | return FALSE; |
451 | } | 457 | } |
452 | 458 | ||
453 | // printID3Tags(); | 459 | // printID3Tags(); |