| author | llornkcor <llornkcor> | 2002-06-26 23:50:27 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2002-06-26 23:50:27 (UTC) |
| commit | a86c09e8a12b504471ffeb8966e34a79dd8518b5 (patch) (side-by-side diff) | |
| tree | bea361029616edb533136880b973dae4a7e7315e /core/multimedia/opieplayer | |
| parent | b13d95b210c7d16229514afc66e32a1de09a075c (diff) | |
| download | opie-a86c09e8a12b504471ffeb8966e34a79dd8518b5.zip opie-a86c09e8a12b504471ffeb8966e34a79dd8518b5.tar.gz opie-a86c09e8a12b504471ffeb8966e34a79dd8518b5.tar.bz2 | |
fixed error parsing pls where the url's already have a trailing /, and took out muting for now
| -rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 8 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 9 |
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 @@ -194,5 +194,5 @@ 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; @@ -258,5 +258,5 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { //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; } @@ -265,5 +265,5 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { AudioDevice::~AudioDevice() { qDebug("destryo audiodevice"); - QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; + // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; // #ifdef Q_OS_WIN32 @@ -276,5 +276,5 @@ AudioDevice::~AudioDevice() { 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 @@ -1339,6 +1339,11 @@ void PlayListWidget::readPls(const QString &filename) { 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"); |