partly fix playing from audio and video views

2 files changed, 21 insertions, 12 deletions

diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 85228a9..67187f8 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -65,3 +65,4 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     header()->hide();
-    setSorting( -1, FALSE );
+//    setSorting( -1, FALSE );
+  // FIXME
 }
@@ -106,7 +107,7 @@ void PlayListSelection::addToSelection( const DocLnk &lnk ) {
     PlayListSelectionItem *item = new PlayListSelectionItem( this, new DocLnk( lnk ) );
-    QListViewItem *current = selectedItem();
-    if ( current )
-        item->moveItem( current );
+     QListViewItem *current = selectedItem();
+     if ( current )
+    item->moveItem( current );
     setSelected( item, TRUE );
-    ensureItemVisible( selectedItem() );
+    ensureItemVisible( item);
 }
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 395037f..19c8056 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -261,2 +261,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     audioView->setSelectionMode( QListView::Extended);
+    audioView->setSorting( 3, TRUE );
     
@@ -302,2 +303,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
+
+///audioView
     connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
@@ -309,2 +312,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
+
+//videoView
     connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
@@ -315,2 +320,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
+
+//playlists
     connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
@@ -809,7 +816,8 @@ void PlayListWidget::btnPlay(bool b) {
           qDebug("2");
+//          d->selectedFiles->unSelect();
           addToSelection( audioView->currentItem() );
-          mediaPlayerState->setPlaying(b);
-          d->selectedFiles->removeSelected( );
-          tabWidget->setCurrentPage(1);
-          d->selectedFiles->unSelect();
+          mediaPlayerState->setPlaying(true);
+            d->selectedFiles->removeSelected( );
+            d->selectedFiles->unSelect();
+           tabWidget->setCurrentPage(1);
           insanityBool=FALSE;         
@@ -822,7 +830,7 @@ void PlayListWidget::btnPlay(bool b) {
           addToSelection( videoView->currentItem() );
-          mediaPlayerState->setPlaying(b);
-          qApp->processEvents();
+          mediaPlayerState->setPlaying(true);
+//          qApp->processEvents();
           d->selectedFiles->removeSelected( );
-          tabWidget->setCurrentPage(2);
           d->selectedFiles->unSelect();
+          tabWidget->setCurrentPage(2);
           insanityBool=FALSE;