fix for 2.3.4

1 files changed, 5 insertions, 34 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 8d66407..5be0d6d 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -271,5 +271,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     tabWidget->insertTab( vTab,tr("Video"));
-//  populateVideoView();
 
-//playlists list
     QWidget *LTab;
@@ -280,14 +278,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
-//      connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
-
-// add the library area
-
-//     connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
-//              this, SLOT( fauxPlay( QListViewItem *) ) );
-//     connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
-//              this, SLOT( fauxPlay( QListViewItem *)) );
-
-//    connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
-//    connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
-
     connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
@@ -322,3 +308,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
-//   connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
 
@@ -329,3 +314,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
-//    qDebug("currentList is "+currentPlaylist);
     loadList(DocLnk( currentPlaylist));
@@ -353,9 +337,3 @@ void PlayListWidget::initializeStates() {
     d->tbShuffle->setOn( mediaPlayerState->shuffled() );
-//     d->tbFull->setOn( mediaPlayerState->fullscreen() );
-//     d->tbScale->setOn( mediaPlayerState->scaled() );
-//     d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
-//    setPlaylist( mediaPlayerState->playlist() );
     setPlaylist( true);
-//     d->selectedFiles->first();
-
 }
@@ -377,3 +355,2 @@ void PlayListWidget::readConfig( Config& cfg ) {
     d->selectedFiles->setSelectedItem( currentString);
-//    d->selectedFiles->setSelectedItem( (const QString &)currentString);
 }
@@ -418,8 +395,2 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
 void PlayListWidget::addToSelection( const DocLnk& lnk ) {
-//    qDebug("add");
-//     if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) {
-//         QMessageBox::message("Note","You are trying to play\na malformed url.");
-        
-//     } else { 
-
         d->setDocumentUsed = FALSE;
@@ -431,3 +402,2 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
             mediaPlayerState->setPlaying( TRUE );
-//    }
 }
@@ -539,3 +509,3 @@ const DocLnk *PlayListWidget::current() { // this is fugly
           } else {
-              return d->files->selected();
+              return &(d->files->selectedDocument());
           }
@@ -895,5 +865,5 @@ void PlayListWidget::deletePlaylist() {
       case 0: // Yes clicked,
-          QFile().remove(playLists->selected()->file());
-          QFile().remove(playLists->selected()->linkFile());
-          playLists->reread();
+//           QFile().remove(playLists->selected()->file());
+//           QFile().remove(playLists->selected()->linkFile());
+//           playLists->reread();
           break;
@@ -1038,2 +1008,3 @@ void PlayListWidget::populateAudioView() {
                 size = QFile( dit.current()->file() ).size();
+            qDebug(dit.current()->name());
             newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),