2 files changed, 11 insertions, 6 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 8f04d0d..59e06a6 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -192,9 +192,9 @@ 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");
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 
+    //    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 
     d = new AudioDevicePrivate;
     d->frequency = f;
     d->channels = chs;
     d->bytesPerSample = bps;
@@ -256,16 +256,16 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
       //if ( capabilities & DSP_CAP_BATCH )   qDebug( "Sound card has local buffer" );
       //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" );
       //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" );
       //if ( capabilities & DSP_CAP_MMAP )    qDebug( "Sound card can mmap" );
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 
+    //    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 
     
 }
     
 
 AudioDevice::~AudioDevice() {
     qDebug("destryo audiodevice");
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
+    //    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
     
 // #ifdef Q_OS_WIN32
 //     waveOutClose( (HWAVEOUT)d->handle );
 // #else
@@ -274,9 +274,9 @@ AudioDevice::~AudioDevice() {
 # endif
     delete d->unwrittenBuffer;
     delete d;
 //#endif
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
+//    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
     
 }
 
 
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 0332237..4926287 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -1337,10 +1337,15 @@ void PlayListWidget::readPls(const QString &filename) {
 //             name = name.right(name.findRev("/",0,TRUE));
                 lnk.setName( name);
                 if(s.at(s.length()-4) == '.')
                     lnk.setFile( s);
-                else
-                    lnk.setFile( s+"/");
+                else {
+                 if( name.right(1).find('/') == -1)
+                   s+="/";
+                   //                  if(s.right(1) != '/')
+                    lnk.setFile( s);
+
+                }
                 lnk.setType("audio/x-mpegurl");
 
                 qDebug("DocLnk add "+name);
                 d->selectedFiles->addToSelection( lnk);