summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 2323ac2..eeaed33 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -850,13 +850,14 @@ void PlayListWidget::btnPlay(bool b) {
// mediaPlayerState->setPlaying(b);
switch ( tabWidget->currentPageIndex()) {
case 0:
{
qDebug("here we are");
- if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1 || d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
+ if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
+ || d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
QMessageBox::message("Note","You are trying to play\na malformed url.");
} else {
mediaPlayerState->setPlaying(b);
} }
@@ -1230,26 +1231,35 @@ void PlayListWidget::readm3u(const QString &filename) {
QFileInfo f(s);
QString name = f.baseName();
name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
lnk.setName( name);
s=s.replace( QRegExp("\\"),"/");
lnk.setFile( s);
+ lnk.writeLink();
// lnk.setIcon(opieplayer/MPEGPlayer);
qDebug("add "+name);
d->selectedFiles->addToSelection( lnk);
} else { // is url
s.replace(QRegExp("%20")," ");
DocLnk lnk( s);
- QString name = s.right( s.length() - 7);
+ QString name;
+ 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);
- lnk.setFile( s+"/");
+ 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++;
}