fixed error parsing pls where the url's already have a trailing /, and took out muting for now

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
@@ -100,275 +100,275 @@ unsigned int AudioDevicePrivate::rightVolume = 0;
 
 void AudioDevice::getVolume( unsigned int& leftVolume, unsigned int& rightVolume, bool &muted ) {
     muted = AudioDevicePrivate::muted;
     unsigned int volume;
 // #ifdef Q_OS_WIN32
 //     HWAVEOUT handle;
 //     WAVEFORMATEX formatData;
 //     formatData.cbSize = sizeof(WAVEFORMATEX);
 //     formatData.wFormatTag = WAVE_FORMAT_PCM;
 //     formatData.nAvgBytesPerSec = 4 * 44000;
 //     formatData.nBlockAlign = 4;
 //     formatData.nChannels = 2;
 //     formatData.nSamplesPerSec = 44000;
 //     formatData.wBitsPerSample = 16;
 //     waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
 //     if ( waveOutGetVolume( handle, (LPDWORD)&volume ) )
 // //  qDebug( "get volume of audio device failed" );
 //        waveOutClose( handle );
 //     leftVolume = volume & 0xFFFF;
 //     rightVolume = volume >> 16;
 // #else
     int mixerHandle = open( "/dev/mixer", O_RDWR );
     if ( mixerHandle >= 0 ) {
         if(ioctl( mixerHandle, MIXER_READ(0), &volume )==-1)
             perror("ioctl(\"MIXER_READ\")");
         close( mixerHandle );
     } else
         perror("open(\"/dev/mixer\")");
     leftVolume  = ((volume & 0x00FF) << 16) / 101;
     rightVolume = ((volume & 0xFF00) <<  8) / 101;
 //#endif
 }
 
 
 void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, bool muted ) {
     AudioDevicePrivate::muted = muted;
     if ( muted ) {
         AudioDevicePrivate::leftVolume = leftVolume;
         AudioDevicePrivate::rightVolume = rightVolume;
         leftVolume = 0;
         rightVolume = 0;
     } else {
         leftVolume  = ( (int) leftVolume < 0 ) ? 0 : ((  leftVolume > 0xFFFF ) ? 0xFFFF :  leftVolume );
         rightVolume = ( (int)rightVolume < 0 ) ? 0 : (( rightVolume > 0xFFFF ) ? 0xFFFF : rightVolume );
     }
 // #ifdef Q_OS_WIN32
 //     HWAVEOUT handle;
 //     WAVEFORMATEX formatData;
 //     formatData.cbSize = sizeof(WAVEFORMATEX);
 //     formatData.wFormatTag = WAVE_FORMAT_PCM;
 //     formatData.nAvgBytesPerSec = 4 * 44000;
 //     formatData.nBlockAlign = 4;
 //     formatData.nChannels = 2;
 //     formatData.nSamplesPerSec = 44000;
 //     formatData.wBitsPerSample = 16;
 //     waveOutOpen(&handle, WAVE_MAPPER, &formatData, 0L, 0L, CALLBACK_NULL);
 //     unsigned int volume = (rightVolume << 16) | leftVolume;
 //     if ( waveOutSetVolume( handle, volume ) )
 // //  qDebug( "set volume of audio device failed" );
 //        waveOutClose( handle );
 // #else
       // Volume can be from 0 to 100 which is 101 distinct values
     unsigned int rV = (rightVolume * 101) >> 16;
 
 # if 0
     unsigned int lV = (leftVolume  * 101) >> 16;
     unsigned int volume = ((rV << 8) & 0xFF00) | (lV & 0x00FF);
     int mixerHandle = 0;
     if ( ( mixerHandle = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
         if(ioctl( mixerHandle, MIXER_WRITE(0), &volume ) ==-1)
             perror("ioctl(\"MIXER_WRITE\")");
         close( mixerHandle );
     } else
         perror("open(\"/dev/mixer\")");
 
 # else
       // This is the way this has to be done now I guess, doesn't allow for
       // independant right and left channel setting, or setting for different outputs
     Config cfg("qpe"); // qtopia is "Sound"
     cfg.setGroup("Volume"); // qtopia is "Settings"
     cfg.writeEntry("VolumePercent",(int)rV); //qtopia is Volume
 # endif
 
 //#endif
 //    qDebug( "setting volume to: 0x%x", volume ); 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
       // Send notification that the volume has changed
     QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted; 
 #endif
 }
 
 
 
 
 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;
     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);
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
 
     int fragments = 0x10000 * 8 + sound_fragment_shift;
     int capabilities = 0;
 
     
 #ifdef KEEP_DEVICE_OPEN
     if ( AudioDevicePrivate::dspFd == 0 ) {
 #endif
         if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
 
 //            perror("open(\"/dev/dsp\") sending to /dev/null instead");
         perror("open(\"/dev/dsp\")");
         QString errorMsg=tr("Somethin's wrong with\nyour sound device.\nopen(\"/dev/dsp\")\n")+(QString)strerror(errno)+tr("\n\nClosing player now.");
         QMessageBox::critical(0, "Vmemo", errorMsg, tr("Abort"));
         exit(-1); //harsh?
 //            d->handle = ::open( "/dev/null", O_WRONLY );
           // WTF?!?!
         }
 #ifdef KEEP_DEVICE_OPEN 
         AudioDevicePrivate::dspFd = d->handle;
     } else {
         d->handle = AudioDevicePrivate::dspFd;
     }
 #endif
 
     if(ioctl( d->handle, SNDCTL_DSP_GETCAPS, &capabilities )==-1)
         perror("ioctl(\"SNDCTL_DSP_GETCAPS\")");
     if(ioctl( d->handle, SNDCTL_DSP_SETFRAGMENT, &fragments )==-1)
         perror("ioctl(\"SNDCTL_DSP_SETFRAGMENT\")");
     if(ioctl( d->handle, SNDCTL_DSP_SETFMT, & format )==-1)
         perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
     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);
     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)
             perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
     }
 
     d->bufferSize = sound_fragment_bytes;
     d->unwrittenBuffer = new char[d->bufferSize];
     d->unwritten = 0;
     d->can_GETOSPACE = TRUE; // until we find otherwise
  
       //if ( chs != d->channels )       qDebug( "Wanted %d, got %d channels", chs, d->channels );
       //if ( f != d->frequency )        qDebug( "wanted %dHz, got %dHz", f, d->frequency );
       //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
 # ifndef KEEP_DEVICE_OPEN 
     close( d->handle );     // Now it should be safe to shut the handle
 # endif
     delete d->unwrittenBuffer;
     delete d;
 //#endif
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
+//    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
     
 }
 
 
 void AudioDevice::volumeChanged( bool muted )
 {
     AudioDevicePrivate::muted = muted;
 }
 
 
 void AudioDevice::write( char *buffer, unsigned int length )
 {
 // #ifdef Q_OS_WIN32
 //     // returns immediately and (to be implemented) emits completedIO() when finished writing
 //     WAVEHDR *lpWaveHdr = (WAVEHDR *)malloc( sizeof(WAVEHDR) );
 //     // maybe the buffer should be copied so that this fool proof, but its a performance hit
 //     lpWaveHdr->lpData = buffer;
 //     lpWaveHdr->dwBufferLength = length;
 //     lpWaveHdr->dwFlags = 0L;
 //     lpWaveHdr->dwLoops = 0L;
 //     waveOutPrepareHeader( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) );
 //     // waveOutWrite returns immediately. the data is sent in the background. 
 //     if ( waveOutWrite( (HWAVEOUT)d->handle, lpWaveHdr, sizeof(WAVEHDR) ) )
 //   qDebug( "failed to write block to audio device" );
 //     // emit completedIO();
 // #else
     int t = ::write( d->handle, buffer, length );
     if ( t<0 ) t = 0;
     if ( t != (int)length) {
         qDebug("Ahhh!! memcpys 1");
         memcpy(d->unwrittenBuffer,buffer+t,length-t);
         d->unwritten = length-t;
     }
 //#endif
 }
 
 
 unsigned int AudioDevice::channels() const
 {
     return d->channels;
 }
 
 
 unsigned int AudioDevice::frequency() const
 {
     return d->frequency;
 }
 
 
 unsigned int AudioDevice::bytesPerSample() const
 {
     return d->bytesPerSample;
 }
 
 
 unsigned int AudioDevice::bufferSize() const
 {
     return d->bufferSize;
 }
 
 unsigned int AudioDevice::canWrite() const
 {
 // #ifdef Q_OS_WIN32
 //     return bufferSize(); // Any better?
 // #else
     audio_buf_info info;
     if ( d->can_GETOSPACE && ioctl(d->handle,SNDCTL_DSP_GETOSPACE,&info) ) {
         d->can_GETOSPACE = FALSE;
         fcntl( d->handle, F_SETFL, O_NONBLOCK );
     }
     if ( d->can_GETOSPACE ) {
         int t = info.fragments * sound_fragment_bytes;
         return QMIN(t,(int)bufferSize());
     } else {
         if ( d->unwritten ) {
             int t = ::write( d->handle, d->unwrittenBuffer, d->unwritten );
             if ( t<0 ) t = 0;
             if ( (unsigned)t!=d->unwritten ) {
                 memcpy(d->unwrittenBuffer,d->unwrittenBuffer+t,d->unwritten-t);
                 d->unwritten -= t;
             } else {
                 d->unwritten = 0;
             }
         }
         if ( d->unwritten )
             return 0;
         else
             return d->bufferSize;
     }
 //#endif
 }
 
 
 int AudioDevice::bytesWritten() {
 // #ifdef Q_OS_WIN32
 //     MMTIME pmmt = { TIME_BYTES, 0 };
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
@@ -1245,108 +1245,113 @@ void PlayListWidget::readm3u(const QString &filename) {
                         if(name.left(4)=="http")
                             name = s.right( s.length() - 7);
                         else
                             name=s;
 //                         name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
                         lnk.setName(name);
                         if(s.at(s.length()-4) == '.')
                             lnk.setFile( s);
                         else
                             lnk.setFile( s+"/");
 //                         lnk.setFile( filename);
 //                         lnk.setComment( s+"/");
                         lnk.setType("audio/x-mpegurl");
                         lnk.writeLink();
 //                          lnk.setIcon( "opieplayer/MPEGPlayer");
 //                          qDebug("add "+s);
                         d->selectedFiles->addToSelection( lnk);
                     }
                     i++;
                 }
             }
         }
     }
     f.close();
 }
 
 void PlayListWidget::writem3u() {
 
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0);
     fileDlg->exec();
         QString filename,list;
     if( fileDlg->result() == 1 ) {
         filename = fileDlg->LineEdit1->text();
         qDebug(filename);
         int noOfFiles = 0;
         d->selectedFiles->first();
         do {
 // we dont check for existance because of url's
 //         qDebug(d->selectedFiles->current()->file());
                 list += d->selectedFiles->current()->file()+"\n";
                 noOfFiles++;
         }
         while ( d->selectedFiles->next() );
         qDebug(list);
         if(filename.left(1) != "/")
             filename=QPEApplication::documentDir()+"/"+filename;
         if(filename.right(3) != "m3u")
             filename=filename+".m3u";
         
         QFile f(filename);
         f.open(IO_WriteOnly);
         f.writeBlock(list, list.length());
         f.close();
     }
     if(fileDlg) delete fileDlg;
 }
 
 void PlayListWidget::readPls(const QString &filename) {
 
     qDebug("pls filename is "+filename);
     QFile f(filename);
 
     if(f.open(IO_ReadOnly)) {
         QTextStream t(&f);
         QString s;//, first, second;
         int i=0;
         while ( !t.atEnd()) {
             s=t.readLine();
             if(s.left(4) == "File") {
                 s=s.right(s.length() - 6);
                 s.replace(QRegExp("%20")," ");
                 qDebug("adding "+s+" to playlist");
 // numberofentries=2
 // File1=http
 // Title
 // Length
 // Version
 // File2=http
              
                 s=s.replace( QRegExp("\\"),"/");
                 DocLnk lnk( s );
                 QFileInfo f(s);
                 QString name = f.baseName();
                 if(name.left(4)=="http")
                     name = s.right( s.length() - 7);
                 else
                     name=s;
                 name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
 //             QFileInfo f(s);
 //             QString name = f.baseName();
 //             name = name.left(name.length()-4);
 //             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);
             }
         }
         i++;
     }
 }