- simplified MediaPlayer::setPlaying, moving more switch() like code into

  playlistwidget

1 files changed, 11 insertions, 1 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index fd256b7..ce73252 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -421,13 +421,13 @@ void PlayListWidget::setDocument( const QString& fileref ) {
 
 void PlayListWidget::useSelectedDocument() {
     d->setDocumentUsed = FALSE;
 }
 
 
-const DocLnk *PlayListWidget::current() { // this is fugly
+const DocLnk *PlayListWidget::current() const { // this is fugly
     assert( currentTab() == CurrentPlayList );
 
 //      qDebug("playlist");
     if ( mediaPlayerState->isUsingPlaylist() ) {
         return d->selectedFiles->current();
     } else if ( d->setDocumentUsed && d->current ) {
@@ -1138,9 +1138,19 @@ PlayListWidget::TabType PlayListWidget::currentTab() const
     int index = tabWidget->currentPageIndex();
     assert( index < TabTypeCount && index >= 0 );
 
     return indexToTabType[ index ];
 }
 
+PlayListWidget::Entry PlayListWidget::currentEntry() const
+{
+    if ( currentTab() == CurrentPlayList ) {
+        const DocLnk *lnk = current();
+        return Entry( lnk->name(), lnk->file() );
+    }
+
+    return Entry( currentFileListPathName() );
+}
+
 QString PlayListWidget::currentFileListPathName() const {
     return currentFileListView()->currentItem()->text( 3 );
 }