more fixes 2

1 files changed, 8 insertions, 17 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index cc4be23..c0d3108 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -494,13 +494,13 @@ void PlayListWidget::playIt( QListViewItem *it) {
     d->selectedFiles->unSelect();
 }
 
 
 void PlayListWidget::addToSelection( QListViewItem *it) {
     d->setDocumentUsed = FALSE;
-    qDebug("addToSelection2");
+
     if(it) {
         switch ( whichList()) {
           case 1: {
               QListIterator<DocLnk> dit( files.children() );
               for ( ; dit.current(); ++dit ) {
                   if( dit.current()->name() == it->text(0)) {
@@ -720,36 +720,27 @@ void PlayListWidget::openFile() {
                 m3uFile=filename;
                 m3uFile = m3uFile.right( m3uFile.length() - 7);
             } else{
                 m3uFile=filename;
             }
 
-            qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile);
-            m3uList = new Om3u( cfg.readEntry("CurrentPlaylist",""), IO_Append | IO_ReadWrite );
-            m3uList->add( filename);
-            m3uList->write();
-            m3uList->close();
-            if(m3uList) delete m3uList;
+//            qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile);
             lnk.setName( filename ); //sets name
             lnk.setFile( filename ); //sets file name
             lnk.setIcon("opieplayer2/musicfile");
             d->selectedFiles->addToSelection(  lnk );
+            writeCurrentM3u();
         }
         else if( filename.right( 3) == "m3u" ) {
             readm3u( filename );
 
         } else if( filename.right(3) == "pls" ) {
             readPls( filename );
-        }
-        else {
-            m3uList = new Om3u( cfg.readEntry("CurrentPlaylist",""), IO_Append | IO_ReadWrite );
-            m3uList->add( filename);
-            m3uList->write();
-            m3uList->close();
-            if(m3uList) delete m3uList;
+        } else {
             d->selectedFiles->addToSelection(  DocLnk(filename) );
+            writeCurrentM3u();
         }
     }
             
     if( fileDlg ) {
         delete fileDlg;
     }
@@ -846,26 +837,26 @@ void PlayListWidget::readPls( const QString &filename ) {
     if(m3uList) delete m3uList;
 }
 
 /*
  writes current playlist to current m3u file */
 void PlayListWidget::writeCurrentM3u() {
-  qDebug("writting to current m3u");
+  qDebug("writing to current m3u");
   Config cfg( "OpiePlayer" );
   cfg.setGroup("PlayList");
   QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
   //    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
   Om3u *m3uList;
   m3uList = new Om3u( currentPlaylist, IO_ReadWrite |IO_Truncate );
   d->selectedFiles->first();
 
   do {
     m3uList->add( d->selectedFiles->current()->file());
   }
   while ( d->selectedFiles->next() );
-  //    qDebug( list );
+//    qDebug( list );
   m3uList->write();
   m3uList->close();
 
   if(m3uList) delete m3uList;
 }
 
@@ -877,13 +868,13 @@ void PlayListWidget::writem3u() {
     fileDlg->exec();
     QString name, filename, list;
     Om3u *m3uList;
 
     if( fileDlg->result() == 1 ) {
         name = fileDlg->text();
-        qDebug( filename );
+//        qDebug( filename );
 
         if( name.left( 1) != "/" ) {
             filename = QPEApplication::documentDir() + "/" + name;
         }
 
         if( name.right( 3 ) != "m3u" ) {