-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 795feaf..c6de5e6 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -1239,65 +1239,65 @@ void PlayListWidget::writeCurrentM3u() { | |||
1239 | while ( d->selectedFiles->next() ); | 1239 | while ( d->selectedFiles->next() ); |
1240 | qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); | 1240 | qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); |
1241 | m3uList->write(); | 1241 | m3uList->write(); |
1242 | m3uList->close(); | 1242 | m3uList->close(); |
1243 | 1243 | ||
1244 | if(m3uList) delete m3uList; | 1244 | if(m3uList) delete m3uList; |
1245 | } | 1245 | } |
1246 | } | 1246 | } |
1247 | 1247 | ||
1248 | /* | 1248 | /* |
1249 | writes current playlist to m3u file */ | 1249 | writes current playlist to m3u file */ |
1250 | void PlayListWidget::writem3u() { | 1250 | void PlayListWidget::writem3u() { |
1251 | InputDialog *fileDlg; | 1251 | InputDialog *fileDlg; |
1252 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); | 1252 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); |
1253 | fileDlg->exec(); | 1253 | fileDlg->exec(); |
1254 | QString name, filename, list; | 1254 | QString name, filename, list; |
1255 | Om3u *m3uList; | 1255 | Om3u *m3uList; |
1256 | 1256 | ||
1257 | if( fileDlg->result() == 1 ) { | 1257 | if( fileDlg->result() == 1 ) { |
1258 | name = fileDlg->text(); | 1258 | name = fileDlg->text(); |
1259 | // qDebug( filename ); | 1259 | // qDebug( filename ); |
1260 | if( name.find("/",0,true) != -1) {// assume they specify a file path | 1260 | if( name.find("/",0,true) != -1) {// assume they specify a file path |
1261 | filename = name; | 1261 | filename = name; |
1262 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); | 1262 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); |
1263 | } | 1263 | } |
1264 | else //otherwise dump it somewhere noticable | 1264 | else //otherwise dump it somewhere noticable |
1265 | filename = QPEApplication::documentDir() + "/" + name; | 1265 | filename = QPEApplication::documentDir() + "/" + name; |
1266 | 1266 | ||
1267 | if( filename.right( 3 ) != "m3u" ) //needs filename extension | 1267 | if( filename.right( 3 ) != "m3u" ) //needs filename extension |
1268 | filename += ".m3u"; | 1268 | filename += ".m3u"; |
1269 | 1269 | ||
1270 | if( d->selectedFiles->first()) { | 1270 | if( d->selectedFiles->first()) { |
1271 | m3uList = new Om3u(filename, IO_ReadWrite); | 1271 | m3uList = new Om3u(filename, IO_ReadWrite | IO_Truncate); |
1272 | 1272 | ||
1273 | do { | 1273 | do { |
1274 | m3uList->add( d->selectedFiles->current()->file()); | 1274 | m3uList->add( d->selectedFiles->current()->file()); |
1275 | } | 1275 | } |
1276 | while ( d->selectedFiles->next() ); | 1276 | while ( d->selectedFiles->next() ); |
1277 | // qDebug( list ); | 1277 | // qDebug( list ); |
1278 | m3uList->write(); | 1278 | m3uList->write(); |
1279 | m3uList->close(); | 1279 | m3uList->close(); |
1280 | if(m3uList) delete m3uList; | 1280 | if(m3uList) delete m3uList; |
1281 | 1281 | ||
1282 | if(fileDlg) delete fileDlg; | 1282 | if(fileDlg) delete fileDlg; |
1283 | 1283 | ||
1284 | DocLnk lnk; | 1284 | DocLnk lnk; |
1285 | lnk.setFile( filename); | 1285 | lnk.setFile( filename); |
1286 | lnk.setIcon("opieplayer2/playlist2"); | 1286 | lnk.setIcon("opieplayer2/playlist2"); |
1287 | lnk.setName( name); //sets file name | 1287 | lnk.setName( name); //sets file name |
1288 | 1288 | ||
1289 | // qDebug(filename); | 1289 | // qDebug(filename); |
1290 | Config config( "OpiePlayer" ); | 1290 | Config config( "OpiePlayer" ); |
1291 | config.setGroup( "PlayList" ); | 1291 | config.setGroup( "PlayList" ); |
1292 | 1292 | ||
1293 | config.writeEntry("CurrentPlaylist",filename); | 1293 | config.writeEntry("CurrentPlaylist",filename); |
1294 | currentPlayList=filename; | 1294 | currentPlayList=filename; |
1295 | 1295 | ||
1296 | if(!lnk.writeLink()) { | 1296 | if(!lnk.writeLink()) { |
1297 | qDebug("Writing doclink did not work"); | 1297 | qDebug("Writing doclink did not work"); |
1298 | } | 1298 | } |
1299 | 1299 | ||
1300 | setCaption(tr("OpiePlayer: ") + name); | 1300 | setCaption(tr("OpiePlayer: ") + name); |
1301 | } | 1301 | } |
1302 | } | 1302 | } |
1303 | } | 1303 | } |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index e9615f1..580460e 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -712,65 +712,65 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
712 | while ( d->selectedFiles->next() ); | 712 | while ( d->selectedFiles->next() ); |
713 | // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); | 713 | // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); |
714 | m3uList->write(); | 714 | m3uList->write(); |
715 | m3uList->close(); | 715 | m3uList->close(); |
716 | } | 716 | } |
717 | delete m3uList; | 717 | delete m3uList; |
718 | 718 | ||
719 | } | 719 | } |
720 | 720 | ||
721 | /* | 721 | /* |
722 | writes current playlist to m3u file */ | 722 | writes current playlist to m3u file */ |
723 | void PlayListWidget::writem3u() { | 723 | void PlayListWidget::writem3u() { |
724 | InputDialog *fileDlg; | 724 | InputDialog *fileDlg; |
725 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); | 725 | fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); |
726 | fileDlg->exec(); | 726 | fileDlg->exec(); |
727 | QString name, filename, list; | 727 | QString name, filename, list; |
728 | Om3u *m3uList; | 728 | Om3u *m3uList; |
729 | 729 | ||
730 | if( fileDlg->result() == 1 ) { | 730 | if( fileDlg->result() == 1 ) { |
731 | name = fileDlg->text(); | 731 | name = fileDlg->text(); |
732 | // qDebug( filename ); | 732 | // qDebug( filename ); |
733 | if( name.find("/",0,true) != -1) {// assume they specify a file path | 733 | if( name.find("/",0,true) != -1) {// assume they specify a file path |
734 | filename = name; | 734 | filename = name; |
735 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); | 735 | name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); |
736 | } | 736 | } |
737 | else //otherwise dump it somewhere noticable | 737 | else //otherwise dump it somewhere noticable |
738 | filename = QPEApplication::documentDir() + "/" + name; | 738 | filename = QPEApplication::documentDir() + "/" + name; |
739 | 739 | ||
740 | if( filename.right( 3 ) != "m3u" ) //needs filename extension | 740 | if( filename.right( 3 ) != "m3u" ) //needs filename extension |
741 | filename += ".m3u"; | 741 | filename += ".m3u"; |
742 | 742 | ||
743 | if( d->selectedFiles->first()) { //ramble through playlist view | 743 | if( d->selectedFiles->first()) { //ramble through playlist view |
744 | m3uList = new Om3u( filename, IO_ReadWrite); | 744 | m3uList = new Om3u( filename, IO_ReadWrite | IO_Truncate); |
745 | 745 | ||
746 | do { | 746 | do { |
747 | m3uList->add( d->selectedFiles->current()->file()); | 747 | m3uList->add( d->selectedFiles->current()->file()); |
748 | } | 748 | } |
749 | while ( d->selectedFiles->next() ); | 749 | while ( d->selectedFiles->next() ); |
750 | // qDebug( list ); | 750 | // qDebug( list ); |
751 | m3uList->write(); | 751 | m3uList->write(); |
752 | m3uList->close(); | 752 | m3uList->close(); |
753 | delete m3uList; | 753 | delete m3uList; |
754 | 754 | ||
755 | delete fileDlg; | 755 | delete fileDlg; |
756 | 756 | ||
757 | DocLnk lnk; | 757 | DocLnk lnk; |
758 | lnk.setFile( filename); | 758 | lnk.setFile( filename); |
759 | lnk.setIcon("opieplayer2/playlist2"); | 759 | lnk.setIcon("opieplayer2/playlist2"); |
760 | lnk.setName( name); //sets file name | 760 | lnk.setName( name); //sets file name |
761 | 761 | ||
762 | // qDebug(filename); | 762 | // qDebug(filename); |
763 | Config config( "OpiePlayer" ); | 763 | Config config( "OpiePlayer" ); |
764 | config.setGroup( "PlayList" ); | 764 | config.setGroup( "PlayList" ); |
765 | 765 | ||
766 | config.writeEntry("CurrentPlaylist",filename); | 766 | config.writeEntry("CurrentPlaylist",filename); |
767 | currentPlayList=filename; | 767 | currentPlayList=filename; |
768 | 768 | ||
769 | if(!lnk.writeLink()) { | 769 | if(!lnk.writeLink()) { |
770 | qDebug("Writing doclink did not work"); | 770 | qDebug("Writing doclink did not work"); |
771 | } | 771 | } |
772 | 772 | ||
773 | setCaption(tr("OpiePlayer: ") + name); | 773 | setCaption(tr("OpiePlayer: ") + name); |
774 | } | 774 | } |
775 | } | 775 | } |
776 | } | 776 | } |