-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 35208e4..b0d4958 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -396,80 +396,85 @@ void PlayListWidget::writeConfig( Config& cfg ) const { | |||
396 | if ( !QFile::exists( lnk->linkFile() ) ) { | 396 | if ( !QFile::exists( lnk->linkFile() ) ) { |
397 | // the way writing lnks doesn't really check for out | 397 | // the way writing lnks doesn't really check for out |
398 | // of disk space, but check it anyway. | 398 | // of disk space, but check it anyway. |
399 | if ( !lnk->writeLink() ) { | 399 | if ( !lnk->writeLink() ) { |
400 | QMessageBox::critical( 0, tr("Out of space"), | 400 | QMessageBox::critical( 0, tr("Out of space"), |
401 | tr( "There was a problem saving " | 401 | tr( "There was a problem saving " |
402 | "the playlist.\n" | 402 | "the playlist.\n" |
403 | "Your playlist " | 403 | "Your playlist " |
404 | "may be missing some entries\n" | 404 | "may be missing some entries\n" |
405 | "the next time you start it." ) | 405 | "the next time you start it." ) |
406 | ); | 406 | ); |
407 | } | 407 | } |
408 | } | 408 | } |
409 | noOfFiles++; | 409 | noOfFiles++; |
410 | } | 410 | } |
411 | } | 411 | } |
412 | while ( d->selectedFiles->next() ); | 412 | while ( d->selectedFiles->next() ); |
413 | cfg.writeEntry("NumberOfFiles", noOfFiles ); | 413 | cfg.writeEntry("NumberOfFiles", noOfFiles ); |
414 | } | 414 | } |
415 | 415 | ||
416 | 416 | ||
417 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { | 417 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { |
418 | // qDebug("add"); | 418 | // qDebug("add"); |
419 | d->setDocumentUsed = FALSE; | 419 | d->setDocumentUsed = FALSE; |
420 | if ( mediaPlayerState->playlist() ) | 420 | if ( mediaPlayerState->playlist() ) { |
421 | if(QFileInfo(lnk.file()).exists()) | ||
421 | d->selectedFiles->addToSelection( lnk ); | 422 | d->selectedFiles->addToSelection( lnk ); |
423 | } | ||
422 | else | 424 | else |
423 | mediaPlayerState->setPlaying( TRUE ); | 425 | mediaPlayerState->setPlaying( TRUE ); |
424 | } | 426 | } |
425 | 427 | ||
426 | 428 | ||
427 | void PlayListWidget::clearList() { | 429 | void PlayListWidget::clearList() { |
428 | while ( first() ) | 430 | while ( first() ) |
429 | d->selectedFiles->removeSelected(); | 431 | d->selectedFiles->removeSelected(); |
430 | } | 432 | } |
431 | 433 | ||
432 | 434 | ||
433 | void PlayListWidget::addAllToList() { | 435 | void PlayListWidget::addAllToList() { |
434 | DocLnkSet filesAll; | 436 | DocLnkSet filesAll; |
435 | Global::findDocuments(&filesAll, "video/*;audio/*"); | 437 | Global::findDocuments(&filesAll, "video/*;audio/*"); |
436 | QListIterator<DocLnk> Adit( filesAll.children() ); | 438 | QListIterator<DocLnk> Adit( filesAll.children() ); |
437 | for ( ; Adit.current(); ++Adit ) | 439 | for ( ; Adit.current(); ++Adit ) |
440 | if(QFileInfo(Adit.current()->file()).exists()) | ||
438 | d->selectedFiles->addToSelection( **Adit ); | 441 | d->selectedFiles->addToSelection( **Adit ); |
439 | } | 442 | } |
440 | 443 | ||
441 | 444 | ||
442 | void PlayListWidget::addAllMusicToList() { | 445 | void PlayListWidget::addAllMusicToList() { |
443 | QListIterator<DocLnk> dit( files.children() ); | 446 | QListIterator<DocLnk> dit( files.children() ); |
444 | for ( ; dit.current(); ++dit ) | 447 | for ( ; dit.current(); ++dit ) |
448 | if(QFileInfo(dit.current()->file()).exists()) | ||
445 | d->selectedFiles->addToSelection( **dit ); | 449 | d->selectedFiles->addToSelection( **dit ); |
446 | } | 450 | } |
447 | 451 | ||
448 | 452 | ||
449 | void PlayListWidget::addAllVideoToList() { | 453 | void PlayListWidget::addAllVideoToList() { |
450 | QListIterator<DocLnk> dit( vFiles.children() ); | 454 | QListIterator<DocLnk> dit( vFiles.children() ); |
451 | for ( ; dit.current(); ++dit ) | 455 | for ( ; dit.current(); ++dit ) |
456 | if(QFileInfo( dit.current()->file()).exists()) | ||
452 | d->selectedFiles->addToSelection( **dit ); | 457 | d->selectedFiles->addToSelection( **dit ); |
453 | } | 458 | } |
454 | 459 | ||
455 | 460 | ||
456 | void PlayListWidget::setDocument(const QString& fileref) { | 461 | void PlayListWidget::setDocument(const QString& fileref) { |
457 | qDebug(fileref); | 462 | qDebug(fileref); |
458 | fromSetDocument = TRUE; | 463 | fromSetDocument = TRUE; |
459 | if ( fileref.isNull() ) { | 464 | if ( fileref.isNull() ) { |
460 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); | 465 | QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); |
461 | return; | 466 | return; |
462 | } | 467 | } |
463 | // qDebug("setDocument "+fileref); | 468 | // qDebug("setDocument "+fileref); |
464 | if(fileref.find("m3u",0,TRUE) != -1) { //is m3u | 469 | if(fileref.find("m3u",0,TRUE) != -1) { //is m3u |
465 | readm3u( fileref); | 470 | readm3u( fileref); |
466 | } | 471 | } |
467 | else if(fileref.find("pls",0,TRUE) != -1) { //is pls | 472 | else if(fileref.find("pls",0,TRUE) != -1) { //is pls |
468 | readPls( fileref); | 473 | readPls( fileref); |
469 | } | 474 | } |
470 | else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist | 475 | else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist |
471 | clearList(); | 476 | clearList(); |
472 | loadList(DocLnk(fileref)); | 477 | loadList(DocLnk(fileref)); |
473 | d->selectedFiles->first(); | 478 | d->selectedFiles->first(); |
474 | } else { | 479 | } else { |
475 | clearList(); | 480 | clearList(); |