summaryrefslogtreecommitdiff
authorbipolar <bipolar>2002-03-03 20:00:13 (UTC)
committer bipolar <bipolar>2002-03-03 20:00:13 (UTC)
commit1c2cb5505bd88b1f38cf65936486a73081da8cf4 (patch) (unidiff)
tree876541302b9d1c5e0be619cc44338f2538d68c58
parent86ade8478229710d4a31d1c0604b79565935734e (diff)
downloadopie-1c2cb5505bd88b1f38cf65936486a73081da8cf4.zip
opie-1c2cb5505bd88b1f38cf65936486a73081da8cf4.tar.gz
opie-1c2cb5505bd88b1f38cf65936486a73081da8cf4.tar.bz2
committed by ljp (llornkcor): small fix for player redraw not going so well
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index ae03ec8..de36551 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -540,222 +540,224 @@ void PlayListWidget::saveList() {
540// lnk.setType("player/plain");// hey is this a REGISTERED mime type?!?!? ;D 540// lnk.setType("player/plain");// hey is this a REGISTERED mime type?!?!? ;D
541// lnk.setIcon("MPEGPlayer"); 541// lnk.setIcon("MPEGPlayer");
542// if(!lnk.writeLink()) 542// if(!lnk.writeLink())
543// qDebug("Writing doclink did not work"); 543// qDebug("Writing doclink did not work");
544 544
545 Config cfg( filename +".playlist"); 545 Config cfg( filename +".playlist");
546 writeConfig( cfg ); 546 writeConfig( cfg );
547 } 547 }
548 DocLnk lnk; 548 DocLnk lnk;
549 lnk.setName( filename); //sets file name 549 lnk.setName( filename); //sets file name
550// lnk.setComment(title); 550// lnk.setComment(title);
551 lnk.setFile(QPEApplication::qpeDir()+"Settings/"+filename+".playlist.conf"); //sets File property 551 lnk.setFile(QPEApplication::qpeDir()+"Settings/"+filename+".playlist.conf"); //sets File property
552 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D 552 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
553 lnk.setIcon("MPEGPlayer"); 553 lnk.setIcon("MPEGPlayer");
554 if(!lnk.writeLink()) 554 if(!lnk.writeLink())
555 qDebug("Writing doclink did not work"); 555 qDebug("Writing doclink did not work");
556 556
557 if(fileDlg) 557 if(fileDlg)
558 delete fileDlg; 558 delete fileDlg;
559} 559}
560 560
561 561
562void PlayListWidget::loadList( const DocLnk & lnk) { 562void PlayListWidget::loadList( const DocLnk & lnk) {
563 qDebug("load list "+ lnk.name()+".playlist"); 563 qDebug("load list "+ lnk.name()+".playlist");
564 clearList(); 564 clearList();
565 Config cfg( lnk.name()+".playlist"); 565 Config cfg( lnk.name()+".playlist");
566 readConfig(cfg); 566 readConfig(cfg);
567 tabWidget->setCurrentPage(0); 567 tabWidget->setCurrentPage(0);
568 setCaption("OpiePlayer: "+lnk.name()); 568 setCaption("OpiePlayer: "+lnk.name());
569} 569}
570 570
571 571
572void PlayListWidget::setPlaylist( bool shown ) { 572void PlayListWidget::setPlaylist( bool shown ) {
573 if ( shown ) 573 if ( shown )
574 d->playListFrame->show(); 574 d->playListFrame->show();
575 else 575 else
576 d->playListFrame->hide(); 576 d->playListFrame->hide();
577} 577}
578 578
579 579
580void PlayListWidget::setView( char view ) { 580void PlayListWidget::setView( char view ) {
581 if ( view == 'l' ) 581 if ( view == 'l' )
582 showMaximized(); 582 showMaximized();
583 else 583 else
584 hide(); 584 hide();
585} 585}
586 586
587void PlayListWidget::addSelected() { 587void PlayListWidget::addSelected() {
588 588
589 switch (tabWidget->currentPageIndex()) { 589 switch (tabWidget->currentPageIndex()) {
590 case 0: //playlist 590 case 0: //playlist
591 break; 591 break;
592 case 1: { //audio 592 case 1: { //audio
593 addToSelection( audioView->selectedItem() ); 593 addToSelection( audioView->selectedItem() );
594 } 594 }
595 break; 595 break;
596 case 2: { // video 596 case 2: { // video
597 addToSelection( videoView->selectedItem() ); 597 addToSelection( videoView->selectedItem() );
598 } 598 }
599 break; 599 break;
600 }; 600 };
601} 601}
602 602
603void PlayListWidget::removeSelected() { 603void PlayListWidget::removeSelected() {
604 d->selectedFiles->removeSelected( ); 604 d->selectedFiles->removeSelected( );
605} 605}
606 606
607 607
608void PlayListWidget::playIt( QListViewItem *it) { 608void PlayListWidget::playIt( QListViewItem *it) {
609// d->setDocumentUsed = FALSE; 609// d->setDocumentUsed = FALSE;
610 mediaPlayerState->setPlaying(TRUE); 610 mediaPlayerState->setPlaying(TRUE);
611} 611}
612 612
613void PlayListWidget::addToSelection( QListViewItem *it) { 613void PlayListWidget::addToSelection( QListViewItem *it) {
614 d->setDocumentUsed = FALSE; 614 d->setDocumentUsed = FALSE;
615 615
616 if(it) { 616 if(it) {
617// qDebug("add to selection"); 617// qDebug("add to selection");
618 switch (tabWidget->currentPageIndex()) { 618 switch (tabWidget->currentPageIndex()) {
619 case 1: { 619 case 1: {
620// qDebug("case 1"); 620// qDebug("case 1");
621 QListIterator<DocLnk> dit( files.children() ); 621 QListIterator<DocLnk> dit( files.children() );
622 for ( ; dit.current(); ++dit ) { 622 for ( ; dit.current(); ++dit ) {
623// qDebug(dit.current()->name()); 623// qDebug(dit.current()->name());
624 if( dit.current()->name() == it->text(0)) { 624 if( dit.current()->name() == it->text(0)) {
625 d->selectedFiles->addToSelection( **dit ); 625 d->selectedFiles->addToSelection( **dit );
626 } 626 }
627 } 627 }
628 } 628 }
629 break; 629 break;
630 case 2: { 630 case 2: {
631// qDebug("case 2"); 631// qDebug("case 2");
632 QListIterator<DocLnk> dit( vFiles.children() ); 632 QListIterator<DocLnk> dit( vFiles.children() );
633 for ( ; dit.current(); ++dit ) { 633 for ( ; dit.current(); ++dit ) {
634// qDebug(dit.current()->name()); 634// qDebug(dit.current()->name());
635 if( dit.current()->name() == it->text(0)) { 635 if( dit.current()->name() == it->text(0)) {
636 d->selectedFiles->addToSelection( **dit ); 636 d->selectedFiles->addToSelection( **dit );
637 } 637 }
638 } 638 }
639 } 639 }
640 break; 640 break;
641 case 0: 641 case 0:
642 break; 642 break;
643 }; 643 };
644 tabWidget->setCurrentPage(0); 644 tabWidget->setCurrentPage(0);
645// mediaPlayerState->setPlaying( TRUE ); 645// mediaPlayerState->setPlaying( TRUE );
646 } 646 }
647} 647}
648 648
649void PlayListWidget::tabChanged(QWidget *widg) { 649void PlayListWidget::tabChanged(QWidget *widg) {
650 650
651 switch ( tabWidget->currentPageIndex()) { 651 switch ( tabWidget->currentPageIndex()) {
652 case 0: 652 case 0:
653 { 653 {
654 if( !tbDeletePlaylist->isHidden()) 654 if( !tbDeletePlaylist->isHidden())
655 tbDeletePlaylist->hide(); 655 tbDeletePlaylist->hide();
656 d->tbRemoveFromList->setEnabled(TRUE); 656 d->tbRemoveFromList->setEnabled(TRUE);
657 d->tbAddToList->setEnabled(FALSE); 657 d->tbAddToList->setEnabled(FALSE);
658 } 658 }
659 break; 659 break;
660 case 1: 660 case 1:
661 { 661 {
662 if( !tbDeletePlaylist->isHidden()) 662 if( !tbDeletePlaylist->isHidden())
663 tbDeletePlaylist->hide(); 663 tbDeletePlaylist->hide();
664 d->tbRemoveFromList->setEnabled(FALSE); 664 d->tbRemoveFromList->setEnabled(FALSE);
665 d->tbAddToList->setEnabled(TRUE); 665 d->tbAddToList->setEnabled(TRUE);
666 } 666 }
667 break; 667 break;
668 case 2: 668 case 2:
669 { 669 {
670 if( !tbDeletePlaylist->isHidden()) 670 if( !tbDeletePlaylist->isHidden())
671 tbDeletePlaylist->hide(); 671 tbDeletePlaylist->hide();
672 d->tbRemoveFromList->setEnabled(FALSE); 672 d->tbRemoveFromList->setEnabled(FALSE);
673 d->tbAddToList->setEnabled(TRUE); 673 d->tbAddToList->setEnabled(TRUE);
674 } 674 }
675 break; 675 break;
676 case 3: 676 case 3:
677 { 677 {
678 if( tbDeletePlaylist->isHidden()) 678 if( tbDeletePlaylist->isHidden())
679 tbDeletePlaylist->show(); 679 tbDeletePlaylist->show();
680 playLists->reread(); 680 playLists->reread();
681 } 681 }
682 break; 682 break;
683 }; 683 };
684} 684}
685 685
686/* 686/*
687 list is right clicked*/ 687 list is right clicked*/
688void PlayListWidget::fauxPlay(QListViewItem *it) { 688void PlayListWidget::fauxPlay(QListViewItem *it) {
689 689
690 switch (tabWidget->currentPageIndex()) { 690 switch (tabWidget->currentPageIndex()) {
691 case 0: //playlist 691 case 0: //playlist
692 break; 692 break;
693 case 1: { //audio 693 case 1: { //audio
694 QListIterator<DocLnk> dit( files.children() ); 694 QListIterator<DocLnk> dit( files.children() );
695 for ( ; dit.current(); ++dit ) { 695 for ( ; dit.current(); ++dit ) {
696// qDebug(dit.current()->name()); 696// qDebug(dit.current()->name());
697 if( dit.current()->name() == it->text(0)) { 697 if( dit.current()->name() == it->text(0)) {
698 d->selectedFiles->addToSelection( **dit ); 698 d->selectedFiles->addToSelection( **dit );
699 } 699 }
700 } 700 }
701 } 701 }
702 break; 702 break;
703 case 2: { // video 703 case 2: { // video
704 QListIterator<DocLnk> dit( vFiles.children() ); 704 QListIterator<DocLnk> dit( vFiles.children() );
705 for ( ; dit.current(); ++dit ) { 705 for ( ; dit.current(); ++dit ) {
706// qDebug(dit.current()->name()); 706// qDebug(dit.current()->name());
707 if( dit.current()->name() == it->text(0)) { 707 if( dit.current()->name() == it->text(0)) {
708 d->selectedFiles->addToSelection( **dit ); 708 d->selectedFiles->addToSelection( **dit );
709 } 709 }
710 } 710 }
711 } 711 }
712 break; 712 break;
713 }; 713 };
714 mediaPlayerState->setPlaying( TRUE ); 714 mediaPlayerState->setPlaying( TRUE );
715// tabWidget->setCurrentPage(0); 715// tabWidget->setCurrentPage(0);
716 d->selectedFiles->removeSelected(); 716 d->selectedFiles->removeSelected();
717} 717}
718 718
719/* 719/*
720 play button is pressed*/ 720 play button is pressed*/
721void PlayListWidget::btnPlay(bool b) { // this is fugly 721void PlayListWidget::btnPlay(bool b) { // this is fugly
722 switch ( tabWidget->currentPageIndex()) { 722 switch ( tabWidget->currentPageIndex()) {
723 case 0: 723 case 0:
724 { 724 {
725 mediaPlayerState->setPlaying(b); 725 mediaPlayerState->setPlaying(b);
726 } 726 }
727 break; 727 break;
728 case 1: 728 case 1:
729 { 729 {
730 addToSelection( audioView->selectedItem() ); 730 addToSelection( audioView->selectedItem() );
731 mediaPlayerState->setPlaying(b); 731 mediaPlayerState->setPlaying(b);
732 qApp->processEvents();
732 d->selectedFiles->removeSelected( ); 733 d->selectedFiles->removeSelected( );
733 tabWidget->setCurrentPage(1); 734 tabWidget->setCurrentPage(1);
734 } 735 }
735 break; 736 break;
736 case 2: 737 case 2:
737 { 738 {
738 addToSelection( videoView->selectedItem() ); 739 addToSelection( videoView->selectedItem() );
739 mediaPlayerState->setPlaying(b); 740 mediaPlayerState->setPlaying(b);
741 qApp->processEvents();
740 d->selectedFiles->removeSelected( ); 742 d->selectedFiles->removeSelected( );
741 tabWidget->setCurrentPage(2); 743 tabWidget->setCurrentPage(2);
742 } 744 }
743 break; 745 break;
744 }; 746 };
745 747
746} 748}
747 749
748void PlayListWidget::deletePlaylist() { 750void PlayListWidget::deletePlaylist() {
749 switch( QMessageBox::information( this, (tr("Remove Playlist?")), 751 switch( QMessageBox::information( this, (tr("Remove Playlist?")),
750 (tr("You really want to delete\nthis playlist?")), 752 (tr("You really want to delete\nthis playlist?")),
751 (tr("Yes")), (tr("No")), 0 )){ 753 (tr("Yes")), (tr("No")), 0 )){
752 case 0: // Yes clicked, 754 case 0: // Yes clicked,
753 QFile().remove(playLists->selected()->file()); 755 QFile().remove(playLists->selected()->file());
754 QFile().remove(playLists->selected()->linkFile()); 756 QFile().remove(playLists->selected()->linkFile());
755 playLists->reread(); 757 playLists->reread();
756 break; 758 break;
757 case 1: // Cancel 759 case 1: // Cancel
758 break; 760 break;
759 }; 761 };
760 762
761} 763}