summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 15:02:50 (UTC)
committer simon <simon>2002-12-02 15:02:50 (UTC)
commit5380767372ecf3ab22f799abda32f414b0cc7ede (patch) (unidiff)
treee8e2f3d96589cad708c2ffe8f5c3dd2fb200fc69
parent77147a2001cf991e3581bcb2401143e20a3973d4 (diff)
downloadopie-5380767372ecf3ab22f799abda32f414b0cc7ede.zip
opie-5380767372ecf3ab22f799abda32f414b0cc7ede.tar.gz
opie-5380767372ecf3ab22f799abda32f414b0cc7ede.tar.bz2
- disable playlist addition in the playlists tab
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index c9ae225..a8429e3 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -447,384 +447,385 @@ bool PlayListWidget::prev() {
447 if ( !d->selectedFiles->next() ) 447 if ( !d->selectedFiles->next() )
448 d->selectedFiles->first(); 448 d->selectedFiles->first();
449 } 449 }
450 if ( cur == current() ) 450 if ( cur == current() )
451 if ( !d->selectedFiles->next() ) { 451 if ( !d->selectedFiles->next() ) {
452 d->selectedFiles->first(); 452 d->selectedFiles->first();
453 } 453 }
454 return TRUE; 454 return TRUE;
455 } else { 455 } else {
456 if ( !d->selectedFiles->prev() ) { 456 if ( !d->selectedFiles->prev() ) {
457 if ( mediaPlayerState->isLooping() ) { 457 if ( mediaPlayerState->isLooping() ) {
458 return d->selectedFiles->last(); 458 return d->selectedFiles->last();
459 } else { 459 } else {
460 return FALSE; 460 return FALSE;
461 } 461 }
462 } 462 }
463 return TRUE; 463 return TRUE;
464 } 464 }
465 } else { 465 } else {
466 return mediaPlayerState->isLooping(); 466 return mediaPlayerState->isLooping();
467 } 467 }
468} 468}
469 469
470 470
471bool PlayListWidget::next() { 471bool PlayListWidget::next() {
472//qDebug("<<<<<<<<<<<<next()"); 472//qDebug("<<<<<<<<<<<<next()");
473 if ( mediaPlayerState->isUsingPlaylist() ) { 473 if ( mediaPlayerState->isUsingPlaylist() ) {
474 if ( mediaPlayerState->isShuffled() ) { 474 if ( mediaPlayerState->isShuffled() ) {
475 return prev(); 475 return prev();
476 } else { 476 } else {
477 if ( !d->selectedFiles->next() ) { 477 if ( !d->selectedFiles->next() ) {
478 if ( mediaPlayerState->isLooping() ) { 478 if ( mediaPlayerState->isLooping() ) {
479 return d->selectedFiles->first(); 479 return d->selectedFiles->first();
480 } else { 480 } else {
481 return FALSE; 481 return FALSE;
482 } 482 }
483 } 483 }
484 return TRUE; 484 return TRUE;
485 } 485 }
486 } else { 486 } else {
487 return mediaPlayerState->isLooping(); 487 return mediaPlayerState->isLooping();
488 } 488 }
489} 489}
490 490
491 491
492bool PlayListWidget::first() { 492bool PlayListWidget::first() {
493 if ( mediaPlayerState->isUsingPlaylist() ) 493 if ( mediaPlayerState->isUsingPlaylist() )
494 return d->selectedFiles->first(); 494 return d->selectedFiles->first();
495 else 495 else
496 return mediaPlayerState->isLooping(); 496 return mediaPlayerState->isLooping();
497} 497}
498 498
499 499
500bool PlayListWidget::last() { 500bool PlayListWidget::last() {
501 if ( mediaPlayerState->isUsingPlaylist() ) 501 if ( mediaPlayerState->isUsingPlaylist() )
502 return d->selectedFiles->last(); 502 return d->selectedFiles->last();
503 else 503 else
504 return mediaPlayerState->isLooping(); 504 return mediaPlayerState->isLooping();
505} 505}
506 506
507 507
508 void PlayListWidget::saveList() { 508 void PlayListWidget::saveList() {
509 writem3u(); 509 writem3u();
510 } 510 }
511 511
512 512
513void PlayListWidget::loadList( const DocLnk & lnk) { 513void PlayListWidget::loadList( const DocLnk & lnk) {
514 QString name = lnk.name(); 514 QString name = lnk.name();
515 // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name); 515 // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<currentList is "+name);
516 516
517 if( name.length()>0) { 517 if( name.length()>0) {
518 setCaption("OpiePlayer: "+name); 518 setCaption("OpiePlayer: "+name);
519// qDebug("<<<<<<<<<<<<load list "+ lnk.file()); 519// qDebug("<<<<<<<<<<<<load list "+ lnk.file());
520 clearList(); 520 clearList();
521 readm3u(lnk.file()); 521 readm3u(lnk.file());
522 tabWidget->setCurrentPage(0); 522 tabWidget->setCurrentPage(0);
523 } 523 }
524} 524}
525 525
526 526
527void PlayListWidget::setPlaylist( bool shown ) { 527void PlayListWidget::setPlaylist( bool shown ) {
528 if ( shown ) { 528 if ( shown ) {
529 d->playListFrame->show(); 529 d->playListFrame->show();
530 } else { 530 } else {
531 d->playListFrame->hide(); 531 d->playListFrame->hide();
532 } 532 }
533} 533}
534 534
535 535
536void PlayListWidget::addSelected() { 536void PlayListWidget::addSelected() {
537 assert( inFileListMode() ); 537 assert( inFileListMode() );
538 538
539 QListView *fileListView = currentFileListView(); 539 QListView *fileListView = currentFileListView();
540 QListViewItemIterator it( fileListView ); 540 QListViewItemIterator it( fileListView );
541 for ( ; it.current(); ++it ) 541 for ( ; it.current(); ++it )
542 if ( it.current()->isSelected() ) { 542 if ( it.current()->isSelected() ) {
543 QString filename = it.current()->text(3); 543 QString filename = it.current()->text(3);
544 544
545 DocLnk lnk; 545 DocLnk lnk;
546 lnk.setName( QFileInfo( filename ).baseName() ); //sets name 546 lnk.setName( QFileInfo( filename ).baseName() ); //sets name
547 lnk.setFile( filename ); //sets file name 547 lnk.setFile( filename ); //sets file name
548 548
549 d->selectedFiles->addToSelection( lnk ); 549 d->selectedFiles->addToSelection( lnk );
550 } 550 }
551 551
552 fileListView->clearSelection(); 552 fileListView->clearSelection();
553 553
554 tabWidget->setCurrentPage( 0 ); 554 tabWidget->setCurrentPage( 0 );
555 writeCurrentM3u(); 555 writeCurrentM3u();
556} 556}
557 557
558 558
559void PlayListWidget::removeSelected() { 559void PlayListWidget::removeSelected() {
560 d->selectedFiles->removeSelected( ); 560 d->selectedFiles->removeSelected( );
561 writeCurrentM3u(); 561 writeCurrentM3u();
562} 562}
563 563
564 564
565void PlayListWidget::playIt( QListViewItem *it) { 565void PlayListWidget::playIt( QListViewItem *it) {
566 if(!it) return; 566 if(!it) return;
567 mediaPlayerState->setPlaying(FALSE); 567 mediaPlayerState->setPlaying(FALSE);
568 mediaPlayerState->setPlaying(TRUE); 568 mediaPlayerState->setPlaying(TRUE);
569 d->selectedFiles->unSelect(); 569 d->selectedFiles->unSelect();
570} 570}
571 571
572 572
573void PlayListWidget::addToSelection( QListViewItem *it) { 573void PlayListWidget::addToSelection( QListViewItem *it) {
574 d->setDocumentUsed = FALSE; 574 d->setDocumentUsed = FALSE;
575 575
576 if(it) { 576 if(it) {
577 switch ( whichList()) { 577 switch ( whichList()) {
578 case 0: //playlist 578 case 0: //playlist
579 return; 579 return;
580 break; 580 break;
581 }; 581 };
582 // case 1: { 582 // case 1: {
583 DocLnk lnk; 583 DocLnk lnk;
584 QString filename; 584 QString filename;
585 585
586 filename=it->text(3); 586 filename=it->text(3);
587 lnk.setName( QFileInfo(filename).baseName() ); //sets name 587 lnk.setName( QFileInfo(filename).baseName() ); //sets name
588 lnk.setFile( filename ); //sets file name 588 lnk.setFile( filename ); //sets file name
589 d->selectedFiles->addToSelection( lnk); 589 d->selectedFiles->addToSelection( lnk);
590 590
591 writeCurrentM3u(); 591 writeCurrentM3u();
592 tabWidget->setCurrentPage(0); 592 tabWidget->setCurrentPage(0);
593 593
594 } 594 }
595} 595}
596 596
597 597
598void PlayListWidget::tabChanged(QWidget *) { 598void PlayListWidget::tabChanged(QWidget *) {
599 599
600 switch ( whichList()) { 600 switch ( whichList()) {
601 case 0: 601 case 0:
602 { 602 {
603 if( !tbDeletePlaylist->isHidden() ) { 603 if( !tbDeletePlaylist->isHidden() ) {
604 tbDeletePlaylist->hide(); 604 tbDeletePlaylist->hide();
605 } 605 }
606 d->tbRemoveFromList->setEnabled(TRUE); 606 d->tbRemoveFromList->setEnabled(TRUE);
607 d->tbAddToList->setEnabled(FALSE); 607 d->tbAddToList->setEnabled(FALSE);
608 } 608 }
609 break; 609 break;
610 case 1: 610 case 1:
611 { 611 {
612 // audioView->clear(); 612 // audioView->clear();
613 if(!audioPopulated) populateAudioView(); 613 if(!audioPopulated) populateAudioView();
614 614
615 if( !tbDeletePlaylist->isHidden() ) { 615 if( !tbDeletePlaylist->isHidden() ) {
616 tbDeletePlaylist->hide(); 616 tbDeletePlaylist->hide();
617 } 617 }
618 d->tbRemoveFromList->setEnabled(FALSE); 618 d->tbRemoveFromList->setEnabled(FALSE);
619 d->tbAddToList->setEnabled(TRUE); 619 d->tbAddToList->setEnabled(TRUE);
620 } 620 }
621 break; 621 break;
622 case 2: 622 case 2:
623 { 623 {
624 // videoView->clear(); 624 // videoView->clear();
625 if(!videoPopulated) populateVideoView(); 625 if(!videoPopulated) populateVideoView();
626 if( !tbDeletePlaylist->isHidden() ) { 626 if( !tbDeletePlaylist->isHidden() ) {
627 tbDeletePlaylist->hide(); 627 tbDeletePlaylist->hide();
628 } 628 }
629 d->tbRemoveFromList->setEnabled(FALSE); 629 d->tbRemoveFromList->setEnabled(FALSE);
630 d->tbAddToList->setEnabled(TRUE); 630 d->tbAddToList->setEnabled(TRUE);
631 } 631 }
632 break; 632 break;
633 case 3: 633 case 3:
634 { 634 {
635 if( tbDeletePlaylist->isHidden() ) { 635 if( tbDeletePlaylist->isHidden() ) {
636 tbDeletePlaylist->show(); 636 tbDeletePlaylist->show();
637 } 637 }
638 playLists->reread(); 638 playLists->reread();
639 d->tbAddToList->setEnabled(FALSE);
639 } 640 }
640 break; 641 break;
641 }; 642 };
642} 643}
643 644
644 645
645void PlayListWidget::btnPlay(bool b) { 646void PlayListWidget::btnPlay(bool b) {
646// mediaPlayerState->setPlaying(false); 647// mediaPlayerState->setPlaying(false);
647 mediaPlayerState->setPlaying(b); 648 mediaPlayerState->setPlaying(b);
648 insanityBool=FALSE; 649 insanityBool=FALSE;
649} 650}
650 651
651void PlayListWidget::deletePlaylist() { 652void PlayListWidget::deletePlaylist() {
652 switch( QMessageBox::information( this, (tr("Remove Playlist?")), 653 switch( QMessageBox::information( this, (tr("Remove Playlist?")),
653 (tr("You really want to delete\nthis playlist?")), 654 (tr("You really want to delete\nthis playlist?")),
654 (tr("Yes")), (tr("No")), 0 )){ 655 (tr("Yes")), (tr("No")), 0 )){
655 case 0: // Yes clicked, 656 case 0: // Yes clicked,
656 QFile().remove(playLists->selectedDocument().file()); 657 QFile().remove(playLists->selectedDocument().file());
657 QFile().remove(playLists->selectedDocument().linkFile()); 658 QFile().remove(playLists->selectedDocument().linkFile());
658 playLists->reread(); 659 playLists->reread();
659 break; 660 break;
660 case 1: // Cancel 661 case 1: // Cancel
661 break; 662 break;
662 }; 663 };
663} 664}
664 665
665 666
666void PlayListWidget::playSelected() { 667void PlayListWidget::playSelected() {
667 btnPlay( TRUE); 668 btnPlay( TRUE);
668} 669}
669 670
670 671
671void PlayListWidget::scanForAudio() { 672void PlayListWidget::scanForAudio() {
672// qDebug("scan for audio"); 673// qDebug("scan for audio");
673 files.detachChildren(); 674 files.detachChildren();
674 QListIterator<DocLnk> sdit( files.children() ); 675 QListIterator<DocLnk> sdit( files.children() );
675 for ( ; sdit.current(); ++sdit ) { 676 for ( ; sdit.current(); ++sdit ) {
676 delete sdit.current(); 677 delete sdit.current();
677 } 678 }
678// Global::findDocuments( &files, "audio/*"); 679// Global::findDocuments( &files, "audio/*");
679 Global::findDocuments( &files, audioMimes); 680 Global::findDocuments( &files, audioMimes);
680 audioScan = true; 681 audioScan = true;
681 populateAudioView(); 682 populateAudioView();
682} 683}
683 684
684void PlayListWidget::scanForVideo() { 685void PlayListWidget::scanForVideo() {
685// qDebug("scan for video"); 686// qDebug("scan for video");
686 vFiles.detachChildren(); 687 vFiles.detachChildren();
687 QListIterator<DocLnk> sdit( vFiles.children() ); 688 QListIterator<DocLnk> sdit( vFiles.children() );
688 for ( ; sdit.current(); ++sdit ) { 689 for ( ; sdit.current(); ++sdit ) {
689 delete sdit.current(); 690 delete sdit.current();
690 } 691 }
691 Global::findDocuments(&vFiles, "video/*"); 692 Global::findDocuments(&vFiles, "video/*");
692 videoScan = true; 693 videoScan = true;
693 populateVideoView(); 694 populateVideoView();
694} 695}
695 696
696void PlayListWidget::populateAudioView() { 697void PlayListWidget::populateAudioView() {
697 audioView->clear(); 698 audioView->clear();
698 StorageInfo storageInfo; 699 StorageInfo storageInfo;
699 // const QList<FileSystem> &fs = storageInfo.fileSystems(); 700 // const QList<FileSystem> &fs = storageInfo.fileSystems();
700 if(!audioScan) { 701 if(!audioScan) {
701 scanForAudio(); 702 scanForAudio();
702 } 703 }
703 704
704 QListIterator<DocLnk> dit( files.children() ); 705 QListIterator<DocLnk> dit( files.children() );
705 // QListIterator<FileSystem> it ( fs ); 706 // QListIterator<FileSystem> it ( fs );
706 audioView->clear(); 707 audioView->clear();
707 708
708 QString storage; 709 QString storage;
709 for ( ; dit.current(); ++dit ) { 710 for ( ; dit.current(); ++dit ) {
710// // for( ; it.current(); ++it ){ 711// // for( ; it.current(); ++it ){
711// const QString name = (*dit)->name(); 712// const QString name = (*dit)->name();
712// const QString path = (*dit)->path(); 713// const QString path = (*dit)->path();
713// if(dit.current()->file().find(path) != -1 ) { 714// if(dit.current()->file().find(path) != -1 ) {
714// storage = name; 715// storage = name;
715// // } 716// // }
716// } 717// }
717 718
718 QListViewItem * newItem; 719 QListViewItem * newItem;
719 if ( QFile( dit.current()->file()).exists() || 720 if ( QFile( dit.current()->file()).exists() ||
720 dit.current()->file().left(4) == "http" ) { 721 dit.current()->file().left(4) == "http" ) {
721 long size; 722 long size;
722 if( dit.current()->file().left(4) == "http" ) 723 if( dit.current()->file().left(4) == "http" )
723 size=0; 724 size=0;
724 else 725 else
725 size = QFile( dit.current()->file() ).size(); 726 size = QFile( dit.current()->file() ).size();
726 727
727 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), 728 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
728 QString::number(size ), "" /*storage*/, 729 QString::number(size ), "" /*storage*/,
729 dit.current()->file() ); 730 dit.current()->file() );
730 newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) ); 731 newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) );
731// qDebug("<<<< "+dit.current()->file()); 732// qDebug("<<<< "+dit.current()->file());
732 } 733 }
733 } 734 }
734 audioPopulated=true; 735 audioPopulated=true;
735} 736}
736 737
737 738
738void PlayListWidget::populateVideoView() { 739void PlayListWidget::populateVideoView() {
739 videoView->clear(); 740 videoView->clear();
740 StorageInfo storageInfo; 741 StorageInfo storageInfo;
741 // const QList<FileSystem> &fs = storageInfo.fileSystems(); 742 // const QList<FileSystem> &fs = storageInfo.fileSystems();
742 743
743 if(!videoScan ) { 744 if(!videoScan ) {
744 scanForVideo(); 745 scanForVideo();
745 } 746 }
746 747
747 QListIterator<DocLnk> Vdit( vFiles.children() ); 748 QListIterator<DocLnk> Vdit( vFiles.children() );
748// QListIterator<FileSystem> it ( fs ); 749// QListIterator<FileSystem> it ( fs );
749 videoView->clear(); 750 videoView->clear();
750 QString storage, pathName; 751 QString storage, pathName;
751 for ( ; Vdit.current(); ++Vdit ) { 752 for ( ; Vdit.current(); ++Vdit ) {
752// // for( ; it.current(); ++it ) { 753// // for( ; it.current(); ++it ) {
753// const QString name = (*Vdit)->name(); 754// const QString name = (*Vdit)->name();
754// const QString path = (*Vdit)->path(); 755// const QString path = (*Vdit)->path();
755// if( Vdit.current()->file().find(path) != -1 ) { 756// if( Vdit.current()->file().find(path) != -1 ) {
756// storage=name; 757// storage=name;
757// pathName=path; 758// pathName=path;
758// // } 759// // }
759// } 760// }
760 761
761 QListViewItem * newItem; 762 QListViewItem * newItem;
762 if ( QFile( Vdit.current()->file() ).exists() ) { 763 if ( QFile( Vdit.current()->file() ).exists() ) {
763 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), 764 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
764 QString::number( QFile( Vdit.current()->file() ).size() ), 765 QString::number( QFile( Vdit.current()->file() ).size() ),
765 ""/*storage*/, Vdit.current()->file()); 766 ""/*storage*/, Vdit.current()->file());
766 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) ); 767 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) );
767 } 768 }
768 } 769 }
769 videoPopulated=true; 770 videoPopulated=true;
770} 771}
771 772
772QListView *PlayListWidget::currentFileListView() const 773QListView *PlayListWidget::currentFileListView() const
773{ 774{
774 switch ( currentTab() ) { 775 switch ( currentTab() ) {
775 case AudioFiles: return audioView; 776 case AudioFiles: return audioView;
776 case VideoFiles: return videoView; 777 case VideoFiles: return videoView;
777 default: assert( false ); 778 default: assert( false );
778 } 779 }
779 return 0; 780 return 0;
780} 781}
781 782
782bool PlayListWidget::inFileListMode() const 783bool PlayListWidget::inFileListMode() const
783{ 784{
784 TabType tab = currentTab(); 785 TabType tab = currentTab();
785 return tab == AudioFiles || tab == VideoFiles; 786 return tab == AudioFiles || tab == VideoFiles;
786} 787}
787 788
788void PlayListWidget::openFile() { 789void PlayListWidget::openFile() {
789 // http://66.28.164.33:2080 790 // http://66.28.164.33:2080
790 // http://somafm.com/star0242.m3u 791 // http://somafm.com/star0242.m3u
791 QString filename, name; 792 QString filename, name;
792 InputDialog *fileDlg; 793 InputDialog *fileDlg;
793 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); 794 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
794 fileDlg->exec(); 795 fileDlg->exec();
795 if( fileDlg->result() == 1 ) { 796 if( fileDlg->result() == 1 ) {
796 filename = fileDlg->text(); 797 filename = fileDlg->text();
797 qDebug( "Selected filename is " + filename ); 798 qDebug( "Selected filename is " + filename );
798 // Om3u *m3uList; 799 // Om3u *m3uList;
799 DocLnk lnk; 800 DocLnk lnk;
800 Config cfg( "OpiePlayer" ); 801 Config cfg( "OpiePlayer" );
801 cfg.setGroup("PlayList"); 802 cfg.setGroup("PlayList");
802 803
803 if(filename.left(4) == "http") { 804 if(filename.left(4) == "http") {
804 QString m3uFile, m3uFilePath; 805 QString m3uFile, m3uFilePath;
805 if(filename.find(":",8,TRUE) != -1) { //found a port 806 if(filename.find(":",8,TRUE) != -1) { //found a port
806 m3uFile = filename.left( filename.find( ":",8,TRUE)); 807 m3uFile = filename.left( filename.find( ":",8,TRUE));
807 m3uFile = m3uFile.right( 7); 808 m3uFile = m3uFile.right( 7);
808 } else if(filename.left(4) == "http"){ 809 } else if(filename.left(4) == "http"){
809 m3uFile=filename; 810 m3uFile=filename;
810 m3uFile = m3uFile.right( m3uFile.length() - 7); 811 m3uFile = m3uFile.right( m3uFile.length() - 7);
811 } else{ 812 } else{
812 m3uFile=filename; 813 m3uFile=filename;
813 } 814 }
814 815
815// qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile); 816// qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile);
816 lnk.setName( filename ); //sets name 817 lnk.setName( filename ); //sets name
817 lnk.setFile( filename ); //sets file name 818 lnk.setFile( filename ); //sets file name
818 819
819// lnk.setIcon("opieplayer2/musicfile"); 820// lnk.setIcon("opieplayer2/musicfile");
820 821
821 d->selectedFiles->addToSelection( lnk ); 822 d->selectedFiles->addToSelection( lnk );
822 writeCurrentM3u(); 823 writeCurrentM3u();
823 d->selectedFiles->setSelectedItem( lnk.name()); 824 d->selectedFiles->setSelectedItem( lnk.name());
824 } 825 }
825 else if( filename.right( 3) == "m3u" ) { 826 else if( filename.right( 3) == "m3u" ) {
826 readm3u( filename ); 827 readm3u( filename );
827 828
828 } else if( filename.right(3) == "pls" ) { 829 } else if( filename.right(3) == "pls" ) {
829 readPls( filename ); 830 readPls( filename );
830 } else { 831 } else {