committed by ljp (llornkcor): opps, fixed loading playlists

1 files changed, 2 insertions, 3 deletions

diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 7862d8d..ae03ec8 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -29,49 +29,48 @@
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qaction.h>
 #include <qimage.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlist.h>
 #include <qlistbox.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 #include <qpoint.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
 //#include <qtimer.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 
-#include "fileBrowser.h"
 #include "inputDialog.h"
 
 #include <stdlib.h>
 
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
 
 extern MediaPlayerState *mediaPlayerState;
 
 // class myFileSelector {
 
 // };
 class PlayListWidgetPrivate {
 public:
     QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
     QFrame *playListFrame;
     FileSelector *files;
     PlayListSelection *selectedFiles;
     bool setDocumentUsed;
     DocLnk *current;
 };
 
 
@@ -540,51 +539,51 @@ void PlayListWidget::saveList() {
 //          lnk.setFile( filename+".playlist"); //sets File property
 //          lnk.setType("player/plain");// hey is this a REGISTERED mime type?!?!? ;D
 //          lnk.setIcon("MPEGPlayer");
 //          if(!lnk.writeLink())
 //              qDebug("Writing doclink did not work");
         
         Config cfg( filename +".playlist");
         writeConfig( cfg );
     }
     DocLnk lnk;
     lnk.setName( filename); //sets file name
 //          lnk.setComment(title);
     lnk.setFile(QPEApplication::qpeDir()+"Settings/"+filename+".playlist.conf"); //sets File property
     lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
     lnk.setIcon("MPEGPlayer");
     if(!lnk.writeLink())
         qDebug("Writing doclink did not work");
 
     if(fileDlg)
         delete fileDlg;
 }
 
 
 void PlayListWidget::loadList( const DocLnk & lnk) {
-
+    qDebug("load list "+ lnk.name()+".playlist");
     clearList();
-    Config cfg( lnk.file());
+    Config cfg( lnk.name()+".playlist");
     readConfig(cfg);
     tabWidget->setCurrentPage(0);
     setCaption("OpiePlayer: "+lnk.name());
 }
 
 
 void PlayListWidget::setPlaylist( bool shown ) {
     if ( shown ) 
   d->playListFrame->show();
     else
   d->playListFrame->hide();
 }
 
 
 void PlayListWidget::setView( char view ) {
     if ( view == 'l' )
   showMaximized();
     else
   hide();
 }
 
 void PlayListWidget::addSelected() {
 
     switch (tabWidget->currentPageIndex()) {