fix setDoc for playlists and others. remove qDebugs

10 files changed, 117 insertions, 142 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 73e41dc..d01d2ba 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -147,18 +147,18 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
 
 
 AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
-    qDebug("creating new audio device");
+   //    qDebug("creating new audio device");
 //     QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 
     d = new AudioDevicePrivate;
     d->frequency = f;
     d->channels = chs;
     d->bytesPerSample = bps;
-    qDebug("%d",bps);
+    //    qDebug("%d",bps);
     int format=0;
     if( bps == 8)  format  = AFMT_U8;
     else if( bps <= 0) format = AFMT_S16_LE;
     else format = AFMT_S16_LE;
-    qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
+    //    qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
 
     int fragments = 0x10000 * 8 + sound_fragment_shift;
@@ -191,10 +191,10 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
         perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
     if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1)
         perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
-    qDebug("freq %d", d->frequency);
+    //    qDebug("freq %d", d->frequency);
     if(ioctl( d->handle, SNDCTL_DSP_SPEED, &d->frequency )==-1)
         perror("ioctl(\"SNDCTL_DSP_SPEED\")");
-    qDebug("channels %d",d->channels);
+    //    qDebug("channels %d",d->channels);
     if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) {
         d->channels = ( d->channels == 1 ) ? 2 : d->channels;
         if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1)
@@ -218,7 +218,7 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     
 
 AudioDevice::~AudioDevice() {
-    qDebug("destryo audiodevice");
+   //    qDebug("destryo audiodevice");
 //    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
     
 # ifndef KEEP_DEVICE_OPEN 
@@ -242,7 +242,7 @@ void AudioDevice::write( char *buffer, unsigned int length )
     int t = ::write( d->handle, buffer, length );
     if ( t<0 ) t = 0;
     if ( t != (int)length) {
-        qDebug("Ahhh!! memcpys 1");
+       //        qDebug("Ahhh!! memcpys 1");
         memcpy(d->unwrittenBuffer,buffer+t,length-t);
         d->unwritten = length-t;
     }
@@ -305,7 +305,7 @@ unsigned int AudioDevice::canWrite() const
 int AudioDevice::bytesWritten() {
     int buffered = 0;
     if ( ioctl( d->handle, SNDCTL_DSP_GETODELAY, &buffered ) ) {
-        qDebug( "failed to get audio device position" );
+       //        qDebug( "failed to get audio device position" );
         return -1;
     }
     return buffered;
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index a1973e9..b187cb4 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -76,7 +76,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this )
 {
     setCaption( tr("OpiePlayer") );
-    qDebug("<<<<<audioWidget");
+    //    qDebug("<<<<<audioWidget");
     
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
@@ -90,7 +90,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
        skinPath = "opieplayer2/skins/default";
        
-    qDebug("skin path " + skinPath);
+    //    qDebug("skin path " + skinPath);
     
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
@@ -160,22 +160,23 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     setLooping( mediaPlayerState->fullscreen() );
 //    setPaused( mediaPlayerState->paused() );
     setPlaying( mediaPlayerState->playing() );
-
+this->setFocus();
 }
 
 
 AudioWidget::~AudioWidget() {
+   //       setPlaying( false);
     
     for ( int i = 0; i < 10; i++ ) {
-        delete buttonPixUp[i];
-        delete buttonPixDown[i];
+        if(buttonPixUp[i]) delete buttonPixUp[i];
+        if(buttonPixDown[i]) delete buttonPixDown[i];
     }
-    delete pixBg;
-    delete imgUp;
-    delete imgDn;
-    delete imgButtonMask;
+    if(pixBg) delete pixBg;
+    if(imgUp) delete imgUp;
+    if(imgDn) delete imgDn;
+    if(imgButtonMask) delete imgButtonMask;
     for ( int i = 0; i < 10; i++ ) {
-        delete masks[i];
+        if(masks[i]) delete masks[i];
     }
 }
 
@@ -279,6 +280,7 @@ void AudioWidget::setView( char view ) {
         killTimers();
         hide();
     }
+
 }
 
 
@@ -290,6 +292,7 @@ static QString timeAsString( long length ) {
 }
 
 void AudioWidget::updateSlider( long i, long max ) {
+this->setFocus();
     time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
     
     if ( max == 0 )
@@ -357,19 +360,19 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
             bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
                                 && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 );
 
-            if ( isOnButton && i == AudioVolumeUp ) 
-                qDebug("on up");
+//              if ( isOnButton && i == AudioVolumeUp ) 
+//                  qDebug("on up");
 
             if ( isOnButton && !audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
                 switch (i) {
                   case AudioVolumeUp:   
-                      qDebug("more clicked");
+                     //                      qDebug("more clicked");
                       emit moreClicked(); 
                       return;
                   case AudioVolumeDown:
-                      qDebug("less clicked");
+                     //                      qDebug("less clicked");
                       emit lessClicked();
                       return;
                 case AudioForward:
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index 8cf0a75..82242a3 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -100,7 +100,7 @@ LoopControl::LoopControl( QObject *parent, const char *name )
         : QObject( parent, name ) {
     isMuted = FALSE;
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) );
-qDebug("starting loopcontrol");
+    //qDebug("starting loopcontrol");
     audioMutex = new Mutex;
 
     pthread_attr_init(&audio_attr);
@@ -112,12 +112,12 @@ qDebug("starting loopcontrol");
         params.sched_priority = 50;
         pthread_attr_setschedparam(&audio_attr,&params);
     } else {
-        qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
+       //        qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
         pthread_attr_destroy(&audio_attr);
         pthread_attr_init(&audio_attr);
     }
 #endif
-qDebug("create audio thread");
+    //qDebug("create audio thread");
     pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
 }
 
@@ -227,8 +227,8 @@ void LoopControl::startAudio() {
 
             currentSample = audioSampleCounter + 1;
 
-            if ( currentSample != audioSampleCounter + 1 )
-                qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
+//              if ( currentSample != audioSampleCounter + 1 )
+//                  qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
 
             long samplesRead = 0;
             bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
@@ -241,7 +241,7 @@ void LoopControl::startAudio() {
          usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
            }
          else if ( sampleWaitTime <= -5000 ) {
-        qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+            //        qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
  //       //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
         currentSample = sampleWeShouldBeAt;
           }
@@ -361,7 +361,7 @@ bool LoopControl::init( const QString& filename ) {
     stream = 0; // only play stream 0 for now
     current_frame = total_video_frames = total_audio_samples = 0;
     
-    qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
+    //    qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
    
       // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
 //     if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) {
@@ -387,23 +387,23 @@ bool LoopControl::init( const QString& filename ) {
         else
             channels = mediaPlayerState->curDecoder()->audioChannels( astream );
 
-        qDebug( "LC- channels = %d", channels );
+        //        qDebug( "LC- channels = %d", channels );
   
 //        if ( !total_audio_samples )
             total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
 
         total_audio_samples += 1000;
-        qDebug("total samples %d", total_audio_samples);
+        //        qDebug("total samples %d", total_audio_samples);
         mediaPlayerState->setLength( total_audio_samples );
   
         freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-        qDebug( "LC- frequency = %d", freq );
+        //        qDebug( "LC- frequency = %d", freq );
 
         audioSampleCounter = 0;
         int bits_per_sample;
         if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) {
             bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime();
-            qDebug("using stupid hack");
+            //            qDebug("using stupid hack");
         } else {
             bits_per_sample=0;
         }
@@ -451,7 +451,7 @@ bool LoopControl::init( const QString& filename ) {
 
 
 void LoopControl::play() {
-    qDebug("LC- play");
+   //    qDebug("LC- play");
     mediaPlayerState->setPosition( 0); //uglyhack
     
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
index e99c97b..364e77b 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
@@ -192,7 +192,7 @@ void LoopControl::setPosition( long pos ) {
     if ( hasVideoChannel && hasAudioChannel ) {
 	videoMutex->lock();
 	audioMutex->lock();
-qDebug("setting position");
+  //qDebug("setting position");
 	playtime.restart();
 	playtime = playtime.addMSecs( -pos * 1000 / framerate );
 	//begin = clock() - (double)pos * CLOCKS_PER_SEC / framerate;
@@ -308,7 +308,7 @@ void LoopControl::startVideo() {
 	    if ( check ) {
 		videoMutex->lock();
 		if ( current_frame > prev_frame + 1 ) {
-		    qDebug("skipped a frame");
+       //       qDebug("skipped a frame");
 		    mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
 		}
 		prev_frame = current_frame;
@@ -341,8 +341,8 @@ void LoopControl::startAudio() {
 	    if ( currentSample == 0 )
 		currentSample = audioSampleCounter + 1;
 
-	    if ( currentSample != audioSampleCounter + 1 )
-		qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
+//        if ( currentSample != audioSampleCounter + 1 )
+//      qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
 	    audioMutex->unlock();
 
 /*
@@ -371,7 +371,7 @@ void LoopControl::startAudio() {
 	    } else {
 		audioMutex->lock();
 		if ( sampleWaitTime <= -2000 ) {
-		    qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+       //        qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
 		    mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
 		    currentSample = sampleWeShouldBeAt;
 		}
@@ -402,7 +402,7 @@ void LoopControl::startAudio() {
 	}
     }
 
-    qDebug( "End of file" );
+    //    qDebug( "End of file" );
 
     if ( !moreVideo && !moreAudio ) 
 	emitPlayFinished = TRUE;
@@ -416,7 +416,7 @@ void LoopControl::killTimers() {
 	    if ( pthread_cancel(video_tid) == 0 ) {
 		void *thread_result = 0;
 		if ( pthread_join(video_tid,&thread_result) != 0 )
-		    qDebug("thread join error 1");
+       //        qDebug("thread join error 1");
 		pthread_attr_destroy(&video_attr);
 	    }
 	}
@@ -426,7 +426,7 @@ void LoopControl::killTimers() {
 	    if ( pthread_cancel(audio_tid) == 0 ) {
 		void *thread_result = 0;
 		if ( pthread_join(audio_tid,&thread_result) != 0 )
-		    qDebug("thread join error 2");
+       //        qDebug("thread join error 2");
 		pthread_attr_destroy(&audio_attr);
 	    }
 	}
@@ -513,7 +513,7 @@ bool LoopControl::init( const QString& filename ) {
     stream = 0; // only play stream 0 for now
     current_frame = total_video_frames = total_audio_samples = 0;
     
-    qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
+    //    qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
    
     // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
     if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) {
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index 4f3823a..753b2e3 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -80,7 +80,7 @@ void MediaPlayer::play() {
 
 
 void MediaPlayer::setPlaying( bool play ) {
-    qDebug("MediaPlayer setPlaying");
+   //    qDebug("MediaPlayer setPlaying %d", play);
     if ( !play ) {
         mediaPlayerState->setPaused( FALSE );
         loopControl->stop( FALSE );
@@ -91,7 +91,7 @@ void MediaPlayer::setPlaying( bool play ) {
         mediaPlayerState->setPaused( FALSE );
         return;
     }
-    qDebug("about to ctrash");
+    //    qDebug("about to ctrash");
     const DocLnk *playListCurrent = playList->current();
     
     if ( playListCurrent != NULL ) {
@@ -256,7 +256,7 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
       case Key_F11: //menu
           break;
       case Key_F12: //home
-          qDebug("Blank here");
+         //          qDebug("Blank here");
           break;
       case Key_F13: //mail
           break;
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index cf166d6..6823076 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -127,7 +127,7 @@ MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() {
 // }
 
 void MediaPlayerState::loadPlugins() {
-    qDebug("load plugins");
+   //    qDebug("load plugins");
 #ifndef QT_NO_COMPONENT
     QValueList<MediaPlayerPlugin>::Iterator mit;
     for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) {
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp
index 3541e5f..8b92a8c 100644
--- a/core/multimedia/opieplayer/om3u.cpp
+++ b/core/multimedia/opieplayer/om3u.cpp
@@ -70,7 +70,7 @@ void Om3u::readM3u() {
     QString s;
     while ( !t.atEnd() ) {
         s=t.readLine();
-                qDebug(s);
+      //                qDebug(s);
         if( s.find( "#", 0, TRUE) == -1 ) {
                 if( s.left(2) == "E:" || s.left(2) == "P:" ) {
                     s = s.right( s.length() -2 );
@@ -135,7 +135,7 @@ void Om3u::write() { //writes list to m3u file
   QString list;
   if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
-      qDebug(*it);
+       //      qDebug(*it);
       list += *it+"\n";
     }
     f.writeBlock( list, list.length() );
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 67187f8..94567f2 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -194,7 +194,7 @@ void PlayListSelection::writeCurrent( Config& cfg ) {
     QListViewItem *item = selectedItem();
     if ( item )
         cfg.writeEntry("current", item->text(0) );
-    qDebug(item->text(0));
+    //    qDebug(item->text(0));
 
 }
 
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 7ea95ab..1fc7dd8 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -307,13 +307,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     QWidget *LTab;
     LTab = new QWidget( tabWidget, "LTab" );
-    playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
+    playLists = new FileSelector( "playlist/plain;audio/x-mpegurl", LTab, "fileselector" , FALSE, FALSE);
 
     QGridLayout *layoutL = new QGridLayout( LTab );
     layoutL->setSpacing( 2);
     layoutL->setMargin( 2);
     layoutL->addMultiCellWidget( playLists, 0, 0, 0, 1 );
-//    playLists->setMinimumSize(233,260);
 
     tabWidget->insertTab(LTab,tr("Lists"));
 
@@ -358,12 +357,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
-    QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default");
-    loadList(DocLnk( currentPlaylist));
-    setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlaylist)));
+
+    currentPlayList = cfg.readEntry("CurrentPlaylist","default");
+    loadList(DocLnk( currentPlayList));
+    setCaption(tr("OpiePlayer: ")+ fullBaseName ( QFileInfo(currentPlayList)));
     
     initializeStates();
-    //    audioUI->setFocus();
 }
 
 
@@ -421,15 +420,16 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
             if ( !QFile::exists( lnk->linkFile() ) ) {
                   // the way writing lnks doesn't really check for out
                   // of disk space, but check it anyway.
-                if ( !lnk->writeLink() ) {
-                    QMessageBox::critical( 0, tr("Out of space"),
-                                           tr( "There was a problem saving "
-                                               "the playlist.\n"
-                                               "Your playlist "
-                                               "may be missing some entries\n"
-                                               "the next time you start it." )
-                                           );
-                }
+//                  if ( !lnk->writeLink() ) {
+//                      QMessageBox::critical( 0, tr("Out of space"),
+//                                             tr( "There was a problem saving "
+//                                                 "the playlist.\n"
+//                                                 "Your playlist "
+//                                                 "may be missing some entries\n"
+//                                                 "the next time you start it." )
+//                                             );
+//                  }
+
             }      
             noOfFiles++;
         }
@@ -447,12 +447,18 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
         }
         else
             mediaPlayerState->setPlaying( true);
+
 }
 
 
 void PlayListWidget::clearList() {
     while ( first() )
         d->selectedFiles->removeSelected();
+   Config cfg( "OpiePlayer" );
+   cfg.setGroup("PlayList");
+   cfg.writeEntry("CurrentPlaylist","");
+   currentPlayList="";
+
 }
 
 
@@ -497,21 +503,20 @@ void PlayListWidget::addAllVideoToList() {
 void PlayListWidget::setDocument(const QString& fileref) {
    fromSetDocument = true;
    d->setDocumentUsed = TRUE;
-   d->selectedFiles->setSelected(d->selectedFiles->firstChild(),true );
-   mediaPlayerState->setPlaying( FALSE );
-   qApp->processEvents();
-   mediaPlayerState->setPlaying( TRUE );
+   setDocumentEx(fileref);
 }
 
 void PlayListWidget::setDocumentEx(const QString& fileref) {
-
+   qDebug("opieplayer receive "+fileref);
+   clearList();
+   DocLnk lnk;
     QFileInfo fileInfo(fileref);
     if ( !fileInfo.exists() ) {
         QMessageBox::critical( 0, tr( "Invalid File" ),
                                tr( "There was a problem in getting the file." ) );
         return;
     }
-    qDebug("setDocument "+fileref);
+   //   qDebug("<<<<<<<<<<<<<<<<<<<<<<setDocument "+fileref);
     QString extension = fileInfo.extension(false);
     if( extension.find( "m3u", 0, false) != -1) { //is m3u
         readm3u( fileref);
@@ -521,33 +526,39 @@ void PlayListWidget::setDocumentEx(const QString& fileref) {
     }
     else if( fileref.find("playlist",0,TRUE) != -1) {//is playlist
         clearList();
-        DocLnk lnk;
         lnk.setName( fileInfo.baseName() ); //sets name
         lnk.setFile( fileref ); //sets file name
+      lnk.setIcon("Sound");
           //addToSelection( lnk );
 
         loadList( lnk);
         d->selectedFiles->first();
     } else { 
-        clearList();
-        DocLnk lnk;
+      if( fileref.find(".desktop",0,TRUE) != -1) {
+         lnk = DocLnk(fileref);
+      } else {
         lnk.setName( fileInfo.baseName() ); //sets name
         lnk.setFile( fileref ); //sets file name
+         lnk.setIcon("Sound");
+      }
+
         addToSelection( lnk );
 //        addToSelection( DocLnk( fileref ) );
+      lnk.removeLinkFile();
+      //        qApp->processEvents();
+   }
+      setCaption(tr("OpiePlayer"));
         d->setDocumentUsed = TRUE;
+     d->selectedFiles->setSelected(d->selectedFiles->firstChild(),true );
         mediaPlayerState->setPlaying( FALSE );
         qApp->processEvents();
         mediaPlayerState->setPlaying( TRUE );
-        //        qApp->processEvents();
-        setCaption(tr("OpiePlayer"));
-    }
+
 }
 
 
 void PlayListWidget::setActiveWindow() {
-        qDebug("SETTING active window");
-
+   //        qDebug("SETTING active window");
       // When we get raised we need to ensure that it switches views
     char origView = mediaPlayerState->view();
     mediaPlayerState->setView( 'l' ); // invalidate
@@ -561,26 +572,10 @@ void PlayListWidget::useSelectedDocument() {
 
 
 const DocLnk *PlayListWidget::current() { // this is fugly
-
-//      if( fromSetDocument) {
-//          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);
-//                  return dit;
-//              }
-//          }
-//      } else
-
-          qDebug("current");
-
     switch (tabWidget->currentPageIndex()) {
       case 0: //playlist
       {
-          qDebug("playlist");
+      //          qDebug("playlist");
           if ( mediaPlayerState->playlist() ) {
               return d->selectedFiles->current();
           }
@@ -593,11 +588,10 @@ const DocLnk *PlayListWidget::current() { // this is fugly
       break;
       case 1://audio
       {
-          qDebug("audioView");
+      //          qDebug("audioView");
           QListIterator<DocLnk> dit( files.children() );
           for ( ; dit.current(); ++dit ) {
               if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
-                  qDebug("here");
                   insanityBool=TRUE;
                   return dit;
               }
@@ -606,7 +600,6 @@ const DocLnk *PlayListWidget::current() { // this is fugly
       break;
       case 2: // video
       {
-          qDebug("videoView");
           QListIterator<DocLnk> Vdit( vFiles.children() );
           for ( ; Vdit.current(); ++Vdit ) {
               if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
@@ -717,7 +710,6 @@ void PlayListWidget::setView( char view ) {
 }
 
 void PlayListWidget::addSelected() {
-  qDebug("addSelected");
   DocLnk lnk;
   QString filename;
     switch (tabWidget->currentPageIndex()) {
@@ -767,7 +759,6 @@ void PlayListWidget::removeSelected() {
 void PlayListWidget::playIt( QListViewItem *) {
 //   d->setDocumentUsed = FALSE;
 //  mediaPlayerState->curPosition =0;
-    qDebug("playIt");
     //    mediaPlayerState->setPlaying(FALSE);
     mediaPlayerState->setPlaying(TRUE);
     d->selectedFiles->unSelect();
@@ -841,12 +832,10 @@ void PlayListWidget::tabChanged(QWidget *) {
 }
 
 void PlayListWidget::btnPlay(bool b) {
-    qDebug("<<<<<<<<<<<<<<<BtnPlay %d", b);
 //    mediaPlayerState->setPlaying(b);
     switch ( tabWidget->currentPageIndex()) {
       case 0:
       {
-          qDebug("1");
 //            if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
 //                if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
 //                 QMessageBox::message("Note","You are trying to play\na malformed url.");
@@ -859,7 +848,6 @@ void PlayListWidget::btnPlay(bool b) {
       break;
       case 1:
       {
-          qDebug("2");
 //          d->selectedFiles->unSelect();
           addToSelection( audioView->currentItem() );
           mediaPlayerState->setPlaying( b);
@@ -871,7 +859,6 @@ void PlayListWidget::btnPlay(bool b) {
       break;
       case 2:
       {
-          qDebug("3");
           
           addToSelection( videoView->currentItem() );
           mediaPlayerState->setPlaying( b);
@@ -922,7 +909,6 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint&, int
 
 void PlayListWidget::playSelected()
 {
-    qDebug("playSelected");
     btnPlay( true);
 //    d->selectedFiles->unSelect();
 }
@@ -949,7 +935,7 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi
 void PlayListWidget::listDelete() {
     Config cfg( "OpiePlayer" );
     cfg.setGroup("PlayList");
-    QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+   currentPlayList = cfg.readEntry("CurrentPlaylist","");
     QString file;
 //    int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
     switch ( tabWidget->currentPageIndex()) {
@@ -1073,15 +1059,13 @@ void PlayListWidget::populateVideoView() {
 }
 
 void PlayListWidget::openFile() {
-    qDebug("<<<<<<<<<OPEN File");
     QString filename, name;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->text();
-        qDebug( "Selected filename is " + filename );
-//            Om3u *m3uList;
+      //        qDebug( "Selected filename is " + filename );
             DocLnk lnk;
             Config cfg( "OpiePlayer" );
             cfg.setGroup("PlayList");
@@ -1091,21 +1075,12 @@ void PlayListWidget::openFile() {
         if(filename.left(4) == "http") {
             if(filename.find(":",8,TRUE) != -1) { //found a port
 
-//               m3uFile = filename.left( filename.find( ":",8,TRUE));
                  m3uFile = filename;
                      if( m3uFile.right( 1 ).find( '/' ) == -1) {
                          m3uFile += "/";
                      }
                 filename = m3uFile;
-//                 qDebug("1 "+m3uFile);
-//             } else if(filename.left(4) == "http"){
-//                 m3uFile=filename;
-//                 m3uFile = m3uFile.right( m3uFile.length() - 7);
-//                 qDebug("2 "+m3uFile);
-//             } else{
-//                 m3uFile=filename;
-//                 qDebug("3 "+m3uFile);
-             }
+            =             }
             lnk.setName( m3uFile ); //sets name
             lnk.setFile( filename ); //sets file name
             lnk.setIcon("opieplayer2/musicfile");
@@ -1121,6 +1096,7 @@ void PlayListWidget::openFile() {
             lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
+         lnk.removeLinkFile();
             writeCurrentM3u();
         }
     }
@@ -1134,7 +1110,7 @@ void PlayListWidget::openFile() {
 /*
 reads m3u and shows files/urls to playlist widget */
 void PlayListWidget::readm3u( const QString &filename ) { 
-    qDebug( "read m3u filename " + filename );
+   //    qDebug( "read m3u filename " + filename );
 
     Om3u *m3uList;
     QString s, name;
@@ -1191,7 +1167,7 @@ void PlayListWidget::readm3u( const QString &filename ) {
 reads pls and adds files/urls to playlist  */
 void PlayListWidget::readPls( const QString &filename ) {
 
-    qDebug( "pls filename is " + filename );
+   //    qDebug( "pls filename is " + filename );
     Om3u *m3uList;
     QString s, name;
     m3uList = new Om3u( filename, IO_ReadOnly );
@@ -1234,20 +1210,20 @@ void PlayListWidget::readPls( const QString &filename ) {
 /*
  writes current playlist to current m3u file */
 void PlayListWidget::writeCurrentM3u() {
-  qDebug("writing to current m3u");
+   //  qDebug("writing to current m3u");
   Config cfg( "OpiePlayer" );
   cfg.setGroup("PlayList");
-  QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
+  currentPlayList = cfg.readEntry("CurrentPlaylist","");
   Om3u *m3uList;
-  m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate );
+  m3uList = new Om3u( currentPlayList, IO_ReadWrite | IO_Truncate );
 
   if( d->selectedFiles->first()) {
   do {
-      qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file());
+     //      qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file());
     m3uList->add( d->selectedFiles->current()->file() );
   }
   while ( d->selectedFiles->next() );
-    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
+  //    qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
   m3uList->write();
   m3uList->close();
 
@@ -1304,7 +1280,7 @@ void PlayListWidget::writem3u() {
           currentPlayList=filename;
 
           if(!lnk.writeLink()) {
-            qDebug("Writing doclink did not work");
+            //            qDebug("Writing doclink did not work");
           }
 
           setCaption(tr("OpiePlayer: ") + name);
@@ -1334,7 +1310,6 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 //           doUnblank();
           break;
       case Key_Q: //add to playlist
-          qDebug("Add");
           addSelected();
           break;
       case Key_R: //remove from playlist
@@ -1345,7 +1320,6 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 //           playSelected();
 //           break;
       case Key_Space:
-          qDebug("Play");
 //          playSelected(); puh
           break;
       case Key_1:
@@ -1398,7 +1372,7 @@ void PlayListWidget::keyPressEvent( QKeyEvent *)
 }
 
 void PlayListWidget::doBlank() {
-    qDebug("do blanking");
+   //    qDebug("do blanking");
     fd=open("/dev/fb0",O_RDWR);
     if (fd != -1) {
         ioctl(fd,FBIOBLANK,1);
@@ -1410,7 +1384,7 @@ void PlayListWidget::doUnblank() {
       // this crashes opieplayer with a segfault
 //      int fd;
 //       fd=open("/dev/fb0",O_RDWR);
-    qDebug("do unblanking");
+   //    qDebug("do unblanking");
     if (fd != -1) {
         ioctl(fd,FBIOBLANK,0);
         close(fd);
@@ -1461,7 +1435,7 @@ void PlayListWidget::skinsMenuActivated( int item ) {
 }
 
 void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
-   qDebug("qcop message "+msg );
+   //   qDebug("qcop message "+msg );
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "play()" ) { //plays current selection
       btnPlay( true);
@@ -1498,9 +1472,7 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
    } else if ( msg == "rem(QString)" ) { //remove from playlist
       QString file;
       stream >> file;
-
    } else if ( msg == "setDocument(QString)" ) { //loop or not loop
     QCopEnvelope h("QPE/Application/opieplayer", "raise()");
    }
-   
 }
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 48104ca..02c8568 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -86,7 +86,7 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
       skinPath = "opieplayer2/skins/default";
 
-   qDebug("skin path " + skinPath);
+    //   qDebug("skin path " + skinPath);
 
 //     QString skinPath = "opieplayer2/skins/" + skin;
 
@@ -101,7 +101,7 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    {
       QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
                                   "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
-      qDebug("loading "+filename);
+      //      qDebug("loading "+filename);
       masks[i] = new QBitmap( filename );
 
       if ( !masks[i]->isNull() )
@@ -119,7 +119,7 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
          }
       }
    }
-   qDebug("finished loading first pics");
+   //   qDebug("finished loading first pics");
    for ( int i = 0; i < 7; i++ )
    {
       buttonPixUp[i] = NULL;
@@ -351,7 +351,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                 switch(i) {
 
                 case VideoPlay: {
-                   qDebug("play");
+                   //                   qDebug("play");
                    if(  !mediaPlayerState->playing()) {
                       mediaPlayerState->setPlaying( true);
                       setToggleButton( i-1, false );
@@ -359,12 +359,12 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                       return;
                    }
                    if( mediaPlayerState->isPaused ) {
-                      qDebug("isPaused");
+                      //                      qDebug("isPaused");
                       setToggleButton( i, FALSE );
                       mediaPlayerState->setPaused( FALSE );
                         return;
                     } else if( !mediaPlayerState->isPaused ) {
-                       qDebug("is not paused");
+                       //                       qDebug("is not paused");
                         setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( TRUE );
                         return;
@@ -373,7 +373,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                     }
                 }
 
-                case VideoStop:   qDebug("stop");    mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return;
+                case VideoStop:  mediaPlayerState->setPlaying( FALSE ); setToggleButton( i+1, true); setToggleButton( i, true ); return;
                 case VideoNext:        mediaPlayerState->setNext(); return;
                 case VideoPrevious:    mediaPlayerState->setPrev(); return;
                 case VideoVolUp:      emit moreReleased(); return;