summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp30
1 files changed, 22 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 19c8056..3c5734e 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -682,47 +682,61 @@ void PlayListWidget::setView( char view ) {
682 if ( view == 'l' ) 682 if ( view == 'l' )
683 showMaximized(); 683 showMaximized();
684 else 684 else
685 hide(); 685 hide();
686} 686}
687 687
688void PlayListWidget::addSelected() { 688void PlayListWidget::addSelected() {
689 qDebug("addSelected"); 689 qDebug("addSelected");
690 DocLnk lnk; 690 DocLnk lnk;
691 QString filename; 691 QString filename;
692 switch (tabWidget->currentPageIndex()) { 692 switch (tabWidget->currentPageIndex()) {
693 693
694 case 0: //playlist 694 case 0: //playlist
695 return; 695 return;
696 break; 696 break;
697 case 1: { //audio 697 case 1: { //audio
698 filename=audioView->currentItem()->text(3); 698 QListViewItemIterator it( audioView );
699 // d->selectedFiles->next(); 699 for ( ; it.current(); ++it ) {
700 if ( it.current()->isSelected() ) {
701 filename = it.current()->text(3);
702 lnk.setName( QFileInfo(filename).baseName() ); //sets name
703 lnk.setFile( filename ); //sets file name
704 d->selectedFiles->addToSelection( lnk);
705 }
706 }
707 audioView->clearSelection();
708 // d->selectedFiles->next();
700 } 709 }
701 break; 710 break;
702 711
703 case 2: { // video 712 case 2: { // video
704 filename=videoView->currentItem()->text(3); 713 QListViewItemIterator it( videoView );
705 // tabWidget->setCurrentPage(0); 714 for ( ; it.current(); ++it ) {
706 715 if ( it.current()->isSelected() ) {
716
717 filename = it.current()->text(3);
718 lnk.setName( QFileInfo(filename).baseName() ); //sets name
719 lnk.setFile( filename ); //sets file name
720 d->selectedFiles->addToSelection( lnk);
721 }
722 }
723 videoView->clearSelection();
707 } 724 }
708 break; 725 break;
709 }; 726 };
710 lnk.setName( fullBaseName ( QFileInfo(filename))); //sets name
711 lnk.setFile( filename ); //sets file name
712 d->selectedFiles->addToSelection( lnk);
713 tabWidget->setCurrentPage(0); 727 tabWidget->setCurrentPage(0);
714 writeCurrentM3u(); 728 writeCurrentM3u();
715 729
716} 730}
717 731
718void PlayListWidget::removeSelected() { 732void PlayListWidget::removeSelected() {
719 d->selectedFiles->removeSelected( ); 733 d->selectedFiles->removeSelected( );
720} 734}
721 735
722void PlayListWidget::playIt( QListViewItem *) { 736void PlayListWidget::playIt( QListViewItem *) {
723// d->setDocumentUsed = FALSE; 737// d->setDocumentUsed = FALSE;
724// mediaPlayerState->curPosition =0; 738// mediaPlayerState->curPosition =0;
725 qDebug("playIt"); 739 qDebug("playIt");
726 mediaPlayerState->setPlaying(FALSE); 740 mediaPlayerState->setPlaying(FALSE);
727 mediaPlayerState->setPlaying(TRUE); 741 mediaPlayerState->setPlaying(TRUE);
728 d->selectedFiles->unSelect(); 742 d->selectedFiles->unSelect();