author | llornkcor <llornkcor> | 2002-04-10 21:06:18 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-10 21:06:18 (UTC) |
commit | 0c06c5acf099223f8b0b63849e7e4ed52bf365bb (patch) (side-by-side diff) | |
tree | 9296f9c4ad38b84ecfdbfe8056b19a6ba2765dd0 /core | |
parent | 5d7caf051fb1b46fc2ed7d2f71b03fdf3b42b3ac (diff) | |
download | opie-0c06c5acf099223f8b0b63849e7e4ed52bf365bb.zip opie-0c06c5acf099223f8b0b63849e7e4ed52bf365bb.tar.gz opie-0c06c5acf099223f8b0b63849e7e4ed52bf365bb.tar.bz2 |
kickin out the bug fixes
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 100 |
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 @@ -468,56 +468,57 @@ const DocLnk *PlayListWidget::current() { // this is fugly // if(dit.current()->linkFile() == setDocFileRef) { // qDebug(setDocFileRef); // return dit; // } // } // } else -// qDebug("current"); -// switch (tabWidget->currentPageIndex()) { -// case 0: //playlist -// { -// qDebug("playlist"); - if ( mediaPlayerState->playlist() ) { - return d->selectedFiles->current(); - } - else if ( d->setDocumentUsed && d->current ) { - return d->current; - } else { - return d->files->selected(); - } -// } -// break; -// case 1://audio -// { -// qDebug("audioView"); -// Global::findDocuments(&files, "audio/*"); -// QListIterator<DocLnk> dit( files.children() ); -// for ( ; dit.current(); ++dit ) { -// if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { -// qDebug("here"); -// insanityBool=TRUE; -// return dit; -// } -// } -// } -// break; -// case 2: // video -// { -// qDebug("videoView"); -// Global::findDocuments(&vFiles, "video/*"); -// QListIterator<DocLnk> Vdit( vFiles.children() ); -// for ( ; Vdit.current(); ++Vdit ) { -// if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { -// insanityBool=TRUE; -// return Vdit; -// } -// } -// } -// break; -// }; -// return 0; + + + switch (tabWidget->currentPageIndex()) { + case 0: //playlist + { + qDebug("playlist"); + if ( mediaPlayerState->playlist() ) { + return d->selectedFiles->current(); + } + else if ( d->setDocumentUsed && d->current ) { + return d->current; + } else { + return d->files->selected(); + } + } + break; + case 1://audio + { + qDebug("audioView"); +// Global::findDocuments(&files, "audio/*"); + QListIterator<DocLnk> dit( files.children() ); + for ( ; dit.current(); ++dit ) { + if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { + qDebug("here"); + insanityBool=TRUE; + return dit; + } + } + } + break; + case 2: // video + { + qDebug("videoView"); +// Global::findDocuments(&vFiles, "video/*"); + QListIterator<DocLnk> Vdit( vFiles.children() ); + for ( ; Vdit.current(); ++Vdit ) { + if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { + insanityBool=TRUE; + return Vdit; + } + } + } + break; + }; + return 0; } bool PlayListWidget::prev() { if ( mediaPlayerState->playlist() ) { if ( mediaPlayerState->shuffled() ) { const DocLnk *cur = current(); @@ -791,30 +792,27 @@ void PlayListWidget::btnPlay(bool b) { } break; case 1: { addToSelection( audioView->selectedItem() ); mediaPlayerState->setPlaying(b); -// qApp->processEvents(); d->selectedFiles->removeSelected( ); tabWidget->setCurrentPage(1); - audioView->clearSelection(); -// d->selectedFiles->unSelect(); -// mediaPlayerState->setPlaying(FALSE); + d->selectedFiles->unSelect(); +// audioView->clearSelection(); } break; case 2: { addToSelection( videoView->selectedItem() ); mediaPlayerState->setPlaying(b); qApp->processEvents(); d->selectedFiles->removeSelected( ); tabWidget->setCurrentPage(2); - videoView->clearSelection(); -// d->selectedFiles->unSelect(); -// mediaPlayerState->setPlaying(FALSE); + d->selectedFiles->unSelect(); +// videoView->clearSelection(); } break; }; } void PlayListWidget::deletePlaylist() { |