summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-26 23:50:27 (UTC)
committer llornkcor <llornkcor>2002-06-26 23:50:27 (UTC)
commita86c09e8a12b504471ffeb8966e34a79dd8518b5 (patch) (side-by-side diff)
treebea361029616edb533136880b973dae4a7e7315e
parentb13d95b210c7d16229514afc66e32a1de09a075c (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp8
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp9
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
@@ -195,3 +195,3 @@ 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;
@@ -259,3 +259,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
//if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" );
- QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
+ // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
@@ -266,3 +266,3 @@ AudioDevice::~AudioDevice() {
qDebug("destryo audiodevice");
- QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
+ // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
@@ -277,3 +277,3 @@ AudioDevice::~AudioDevice() {
//#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
@@ -1340,4 +1340,9 @@ void PlayListWidget::readPls(const QString &filename) {
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");