-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 41fcb30..2323ac2 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp @@ -417,4 +417,9 @@ void PlayListWidget::writeConfig( Config& cfg ) const { void PlayListWidget::addToSelection( const DocLnk& lnk ) { // qDebug("add"); + if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) { + QMessageBox::message("Note","You are trying to play\na malformed url."); + + } else { + d->setDocumentUsed = FALSE; if ( mediaPlayerState->playlist() ) { @@ -425,4 +430,5 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) { mediaPlayerState->setPlaying( TRUE ); } +} @@ -847,7 +853,12 @@ void PlayListWidget::btnPlay(bool b) { case 0: { + qDebug("here we are"); + 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); - } + } } break; case 1: @@ -859,6 +870,5 @@ void PlayListWidget::btnPlay(bool b) { d->selectedFiles->unSelect(); insanityBool=FALSE; -// audioView->clearSelection(); - } + }// audioView->clearSelection(); break; case 2: @@ -871,8 +881,8 @@ void PlayListWidget::btnPlay(bool b) { d->selectedFiles->unSelect(); insanityBool=FALSE; -// videoView->clearSelection(); - } + }// videoView->clearSelection(); break; }; + } @@ -1069,6 +1079,9 @@ void PlayListWidget::openFile() { // http://205.188.234.129:8030 // http://66.28.68.70:8000 - filename.replace(QRegExp("%20")," "); - +// filename.replace(QRegExp("%20")," "); + if(filename.find(" ",0,TRUE) != -1 || filename.find("%20",0,TRUE) != -1) { + QMessageBox::message("Note","Spaces in urls are not allowed."); + return; + } else { qDebug("Selected filename is "+filename); if(filename.right(3) == "m3u") @@ -1095,4 +1108,5 @@ void PlayListWidget::openFile() { } } + } if(fileDlg) delete fileDlg; @@ -1206,5 +1220,8 @@ void PlayListWidget::readm3u(const QString &filename) { // Lview->insertLine(t.readLine(),-1); s=t.readLine(); - if(s.find("#",0,TRUE) == -1) { + if(s.find(" ",0,TRUE) != -1 || s.find("%20",0,TRUE) != -1) { + QMessageBox::message("Note","Spaces in urls are not allowed."); + } + else if(s.find("#",0,TRUE) == -1) { if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat if(s.left(2) == "E:" || s.left(2) == "P:") { @@ -1221,4 +1238,5 @@ void PlayListWidget::readm3u(const QString &filename) { d->selectedFiles->addToSelection( lnk); } else { // is url + s.replace(QRegExp("%20")," "); DocLnk lnk( s); @@ -1239,4 +1257,5 @@ void PlayListWidget::readm3u(const QString &filename) { } } + f.close(); } |