summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp100
1 files changed, 49 insertions, 51 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 0764c01..809d5ac 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -471,50 +471,51 @@ const DocLnk *PlayListWidget::current() { // this is fugly
471// } 471// }
472// } 472// }
473// } else 473// } else
474// qDebug("current"); 474
475// switch (tabWidget->currentPageIndex()) { 475
476// case 0: //playlist 476 switch (tabWidget->currentPageIndex()) {
477// { 477 case 0: //playlist
478// qDebug("playlist"); 478 {
479 if ( mediaPlayerState->playlist() ) { 479 qDebug("playlist");
480 return d->selectedFiles->current(); 480 if ( mediaPlayerState->playlist() ) {
481 } 481 return d->selectedFiles->current();
482 else if ( d->setDocumentUsed && d->current ) { 482 }
483 return d->current; 483 else if ( d->setDocumentUsed && d->current ) {
484 } else { 484 return d->current;
485 return d->files->selected(); 485 } else {
486 } 486 return d->files->selected();
487// } 487 }
488// break; 488 }
489// case 1://audio 489 break;
490// { 490 case 1://audio
491// qDebug("audioView"); 491 {
492// Global::findDocuments(&files, "audio/*"); 492 qDebug("audioView");
493// QListIterator<DocLnk> dit( files.children() ); 493// Global::findDocuments(&files, "audio/*");
494// for ( ; dit.current(); ++dit ) { 494 QListIterator<DocLnk> dit( files.children() );
495// if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { 495 for ( ; dit.current(); ++dit ) {
496// qDebug("here"); 496 if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
497// insanityBool=TRUE; 497 qDebug("here");
498// return dit; 498 insanityBool=TRUE;
499// } 499 return dit;
500// } 500 }
501// } 501 }
502// break; 502 }
503// case 2: // video 503 break;
504// { 504 case 2: // video
505// qDebug("videoView"); 505 {
506// Global::findDocuments(&vFiles, "video/*"); 506 qDebug("videoView");
507// QListIterator<DocLnk> Vdit( vFiles.children() ); 507// Global::findDocuments(&vFiles, "video/*");
508// for ( ; Vdit.current(); ++Vdit ) { 508 QListIterator<DocLnk> Vdit( vFiles.children() );
509// if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { 509 for ( ; Vdit.current(); ++Vdit ) {
510// insanityBool=TRUE; 510 if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
511// return Vdit; 511 insanityBool=TRUE;
512// } 512 return Vdit;
513// } 513 }
514// } 514 }
515// break; 515 }
516// }; 516 break;
517// return 0; 517 };
518 return 0;
518} 519}
519 520
520bool PlayListWidget::prev() { 521bool PlayListWidget::prev() {
@@ -794,12 +795,10 @@ void PlayListWidget::btnPlay(bool b) {
794 { 795 {
795 addToSelection( audioView->selectedItem() ); 796 addToSelection( audioView->selectedItem() );
796 mediaPlayerState->setPlaying(b); 797 mediaPlayerState->setPlaying(b);
797// qApp->processEvents();
798 d->selectedFiles->removeSelected( ); 798 d->selectedFiles->removeSelected( );
799 tabWidget->setCurrentPage(1); 799 tabWidget->setCurrentPage(1);
800 audioView->clearSelection(); 800 d->selectedFiles->unSelect();
801// d->selectedFiles->unSelect(); 801// audioView->clearSelection();
802// mediaPlayerState->setPlaying(FALSE);
803 } 802 }
804 break; 803 break;
805 case 2: 804 case 2:
@@ -809,9 +808,8 @@ void PlayListWidget::btnPlay(bool b) {
809 qApp->processEvents(); 808 qApp->processEvents();
810 d->selectedFiles->removeSelected( ); 809 d->selectedFiles->removeSelected( );
811 tabWidget->setCurrentPage(2); 810 tabWidget->setCurrentPage(2);
812 videoView->clearSelection(); 811 d->selectedFiles->unSelect();
813// d->selectedFiles->unSelect(); 812// videoView->clearSelection();
814// mediaPlayerState->setPlaying(FALSE);
815 } 813 }
816 break; 814 break;
817 }; 815 };