author | llornkcor <llornkcor> | 2002-06-26 23:50:27 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-26 23:50:27 (UTC) |
commit | a86c09e8a12b504471ffeb8966e34a79dd8518b5 (patch) (unidiff) | |
tree | bea361029616edb533136880b973dae4a7e7315e /core | |
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 | |||
@@ -195,3 +195,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
195 | qDebug("creating new audio device"); | 195 | qDebug("creating new audio device"); |
196 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 196 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
197 | d = new AudioDevicePrivate; | 197 | d = new AudioDevicePrivate; |
@@ -259,3 +259,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
259 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); | 259 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); |
260 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 260 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
261 | 261 | ||
@@ -266,3 +266,3 @@ AudioDevice::~AudioDevice() { | |||
266 | qDebug("destryo audiodevice"); | 266 | qDebug("destryo audiodevice"); |
267 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 267 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
268 | 268 | ||
@@ -277,3 +277,3 @@ AudioDevice::~AudioDevice() { | |||
277 | //#endif | 277 | //#endif |
278 | QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | 278 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; |
279 | 279 | ||
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) { | |||
1340 | lnk.setFile( s); | 1340 | lnk.setFile( s); |
1341 | else | 1341 | else { |
1342 | lnk.setFile( s+"/"); | 1342 | if( name.right(1).find('/') == -1) |
1343 | s+="/"; | ||
1344 | // if(s.right(1) != '/') | ||
1345 | lnk.setFile( s); | ||
1346 | |||
1347 | } | ||
1343 | lnk.setType("audio/x-mpegurl"); | 1348 | lnk.setType("audio/x-mpegurl"); |