added slight workaround for audio/video playig continuing in playlist

3 files changed, 11 insertions, 4 deletions

diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 756e3b4..6259b3f 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -142,13 +142,12 @@ bool PlayListSelection::prev() {
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
-
 bool PlayListSelection::next() {
     QListViewItem *item = selectedItem();
     if ( item && item->itemBelow() )
         setSelected( item->itemBelow(), TRUE );
     else
   return FALSE;
@@ -178,6 +177,11 @@ bool PlayListSelection::last() {
     else
   return FALSE;
     ensureItemVisible( selectedItem() );
     return TRUE;
 }
 
+void PlayListSelection::unSelect()
+{
+    QListViewItem *item = selectedItem();
+    setSelected( currentItem(), FALSE);
+}
\ No newline at end of file
diff --git a/core/multimedia/opieplayer/playlistselection.h b/core/multimedia/opieplayer/playlistselection.h
index b0d249c..ba37271 100644
--- a/core/multimedia/opieplayer/playlistselection.h
+++ b/core/multimedia/opieplayer/playlistselection.h
@@ -34,12 +34,13 @@ public:
     const DocLnk *current(); // retrieve the current playlist entry (media file link)
 public slots:
     void addToSelection( const DocLnk & ); // Add a media file to the playlist
     void removeSelected();   // Remove a media file from the playlist
     void moveSelectedUp();   // Move the media file up the playlist so it is played earlier
     void moveSelectedDown(); // Move the media file down the playlist so it is played later
+	void unSelect();
     bool prev();
     bool next();
     bool first();
     bool last();
 
 protected:
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index cf665c8..db6533a 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -168,13 +168,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
     QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
 
     QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
     
-    tabWidget = new QTabWidget( hbox6, "tabWidget" ); 
+    tabWidget = new QTabWidget( hbox6, "tabWidget" );
     tabWidget->setTabShape(QTabWidget::Triangular);
     
     QWidget *pTab;
     pTab = new QWidget( tabWidget, "pTab" );
 //      playlistView = new QListView( pTab, "playlistview" );
 //    playlistView->setMinimumSize(236,260);
@@ -479,24 +479,24 @@ const DocLnk *PlayListWidget::current() { // this is fugly
 //          qDebug("from setDoc");
 //          DocLnkSet files;
 //          Global::findDocuments(&files, "video/*;audio/*");
 //          QListIterator<DocLnk> dit( files.children() );
 //          for ( ; dit.current(); ++dit ) {
 //              if(dit.current()->linkFile() ==  setDocFileRef) {
-//                  qDebug(setDocFileRef);  
+//                  qDebug(setDocFileRef);
 //                  return dit;
 //              }
 //          }
 //      } else
 //    qDebug("current");
 //     switch (tabWidget->currentPageIndex()) {
 //          case 0: //playlist
 //          {
           qDebug("playlist");
           if ( mediaPlayerState->playlist() ) {
-              return d->selectedFiles->current();
+		        return d->selectedFiles->current();
           }
           else if ( d->setDocumentUsed && d->current ) {
               return d->current;
           } else {
               return d->files->selected();
           }
@@ -810,22 +810,24 @@ void PlayListWidget::btnPlay(bool b) {
       {
           addToSelection( audioView->selectedItem() );
           mediaPlayerState->setPlaying(b);
 //            qApp->processEvents();
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(1);
+		  d->selectedFiles->unSelect();
 //            mediaPlayerState->setPlaying(FALSE);
       }
       break;
       case 2:
       {
           addToSelection( videoView->selectedItem() );
           mediaPlayerState->setPlaying(b);
           qApp->processEvents();
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(2);
+		  d->selectedFiles->unSelect();
 //            mediaPlayerState->setPlaying(FALSE);
       }
       break;
     };