summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp45
1 files changed, 29 insertions, 16 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 8b25a4c..30e4daa 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -87,4 +87,4 @@ static inline QString fullBaseName ( const QFileInfo &fi )
87{ 87{
88 QString str = fi. fileName ( ); 88 QString str = fi. fileName ( );
89 return str. left ( str. findRev ( '.' )); 89 return str. left ( str. findRev ( '.' ));
90} 90}
@@ -469,4 +469,6 @@ void PlayListWidget::setDocument(const QString& fileref) {
469 fromSetDocument = TRUE; 469 fromSetDocument = TRUE;
470 if ( fileref.isNull() ) { 470 QFileInfo fileInfo(fileref);
471 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); 471 if ( !fileInfo.exists() ) {
472 QMessageBox::critical( 0, tr( "Invalid File" ),
473 tr( "There was a problem in getting the file." ) );
472 return; 474 return;
@@ -474,11 +476,17 @@ void PlayListWidget::setDocument(const QString& fileref) {
474// qDebug("setDocument "+fileref); 476// qDebug("setDocument "+fileref);
475 if(fileref.find("m3u",0,TRUE) != -1) { //is m3u 477 QString extension = fileInfo.extension(false);
478 if( extension.find( "m3u", 0, false) != -1) { //is m3u
476 readm3u( fileref); 479 readm3u( fileref);
477 } 480 }
478 else if(fileref.find("pls",0,TRUE) != -1) { //is pls 481 else if( extension.find( "pls", 0, false) != -1 ) { //is pls
479 readPls( fileref); 482 readPls( fileref);
480 } 483 }
481 else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist 484 else if( fileref.find("playlist",0,TRUE) != -1) {//is playlist
482 clearList(); 485 clearList();
483 loadList(DocLnk(fileref)); 486 DocLnk lnk;
487 lnk.setName( fileInfo.baseName() ); //sets name
488 lnk.setFile( fileref ); //sets file name
489 //addToSelection( lnk );
490
491 loadList( lnk);
484 d->selectedFiles->first(); 492 d->selectedFiles->first();
@@ -486,3 +494,7 @@ void PlayListWidget::setDocument(const QString& fileref) {
486 clearList(); 494 clearList();
487 addToSelection( DocLnk( fileref ) ); 495 DocLnk lnk;
496 lnk.setName( fileInfo.baseName() ); //sets name
497 lnk.setFile( fileref ); //sets file name
498 addToSelection( lnk );
499// addToSelection( DocLnk( fileref ) );
488 d->setDocumentUsed = TRUE; 500 d->setDocumentUsed = TRUE;
@@ -1193,11 +1205,12 @@ void PlayListWidget::writem3u() {
1193// qDebug( filename ); 1205// qDebug( filename );
1194 1206 if( name.find("/",0,true) != -1) {// assume they specify a file path
1195 if( name.left( 1) != "/" ) { 1207 filename = name;
1196 filename = QPEApplication::documentDir() + "/" + name; 1208 name = name.right(name.length()- name.findRev("/",-1,true) - 1 );
1197 }
1198
1199 if( name.right( 3 ) != "m3u" ) {
1200 filename = QPEApplication::documentDir() + "/" +name+".m3u";
1201 } 1209 }
1210 else //otherwise dump it somewhere noticable
1211 filename = QPEApplication::documentDir() + "/" + name;
1202 1212
1213 if( filename.right( 3 ) != "m3u" ) //needs filename extension
1214 filename += ".m3u";
1215
1203 if( d->selectedFiles->first()) { 1216 if( d->selectedFiles->first()) {