-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 | |||
@@ -1207,129 +1207,129 @@ void PlayListWidget::readPls( const QString &filename ) { | |||
1207 | lnk.setFile( s ); | 1207 | lnk.setFile( s ); |
1208 | } else { //if its a url | 1208 | } else { //if its a url |
1209 | if( name.right( 1 ).find( '/' ) == -1) { | 1209 | if( name.right( 1 ).find( '/' ) == -1) { |
1210 | s += "/"; | 1210 | s += "/"; |
1211 | } | 1211 | } |
1212 | lnk.setFile( s ); | 1212 | lnk.setFile( s ); |
1213 | } | 1213 | } |
1214 | lnk.setType( "audio/x-mpegurl" ); | 1214 | lnk.setType( "audio/x-mpegurl" ); |
1215 | 1215 | ||
1216 | lnk.writeLink(); | 1216 | lnk.writeLink(); |
1217 | d->selectedFiles->addToSelection( lnk ); | 1217 | d->selectedFiles->addToSelection( lnk ); |
1218 | } | 1218 | } |
1219 | 1219 | ||
1220 | m3uList->close(); | 1220 | m3uList->close(); |
1221 | if(m3uList) delete m3uList; | 1221 | if(m3uList) delete m3uList; |
1222 | } | 1222 | } |
1223 | 1223 | ||
1224 | /* | 1224 | /* |
1225 | writes current playlist to current m3u file */ | 1225 | writes current playlist to current m3u file */ |
1226 | void PlayListWidget::writeCurrentM3u() { | 1226 | void PlayListWidget::writeCurrentM3u() { |
1227 | qDebug("writing to current m3u"); | 1227 | qDebug("writing to current m3u"); |
1228 | Config cfg( "OpiePlayer" ); | 1228 | Config cfg( "OpiePlayer" ); |
1229 | cfg.setGroup("PlayList"); | 1229 | cfg.setGroup("PlayList"); |
1230 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); | 1230 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); |
1231 | Om3u *m3uList; | 1231 | Om3u *m3uList; |
1232 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); | 1232 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); |
1233 | 1233 | ||
1234 | if( d->selectedFiles->first()) { | 1234 | if( d->selectedFiles->first()) { |
1235 | do { | 1235 | do { |
1236 | qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file()); | 1236 | qDebug( "writeCurrentM3u " +d->selectedFiles->current()->file()); |
1237 | m3uList->add( d->selectedFiles->current()->file() ); | 1237 | m3uList->add( d->selectedFiles->current()->file() ); |
1238 | } | 1238 | } |
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 | } |
1304 | 1304 | ||
1305 | 1305 | ||
1306 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e) | 1306 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e) |
1307 | { | 1307 | { |
1308 | switch ( e->key() ) { | 1308 | switch ( e->key() ) { |
1309 | ////////////////////////////// Zaurus keys | 1309 | ////////////////////////////// Zaurus keys |
1310 | case Key_F9: //activity | 1310 | case Key_F9: //activity |
1311 | // if(audioUI->isHidden()) | 1311 | // if(audioUI->isHidden()) |
1312 | // audioUI->showMaximized(); | 1312 | // audioUI->showMaximized(); |
1313 | break; | 1313 | break; |
1314 | case Key_F10: //contacts | 1314 | case Key_F10: //contacts |
1315 | // if( videoUI->isHidden()) | 1315 | // if( videoUI->isHidden()) |
1316 | // videoUI->showMaximized(); | 1316 | // videoUI->showMaximized(); |
1317 | break; | 1317 | break; |
1318 | case Key_F11: //menu | 1318 | case Key_F11: //menu |
1319 | break; | 1319 | break; |
1320 | case Key_F12: //home | 1320 | case Key_F12: //home |
1321 | // doBlank(); | 1321 | // doBlank(); |
1322 | break; | 1322 | break; |
1323 | case Key_F13: //mail | 1323 | case Key_F13: //mail |
1324 | // doUnblank(); | 1324 | // doUnblank(); |
1325 | break; | 1325 | break; |
1326 | case Key_Q: //add to playlist | 1326 | case Key_Q: //add to playlist |
1327 | qDebug("Add"); | 1327 | qDebug("Add"); |
1328 | addSelected(); | 1328 | addSelected(); |
1329 | break; | 1329 | break; |
1330 | case Key_R: //remove from playlist | 1330 | case Key_R: //remove from playlist |
1331 | removeSelected(); | 1331 | removeSelected(); |
1332 | break; | 1332 | break; |
1333 | // case Key_P: //play | 1333 | // case Key_P: //play |
1334 | // qDebug("Play"); | 1334 | // qDebug("Play"); |
1335 | // playSelected(); | 1335 | // playSelected(); |
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 | |||
@@ -680,129 +680,129 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
680 | d->selectedFiles->addToSelection( lnk ); | 680 | d->selectedFiles->addToSelection( lnk ); |
681 | } | 681 | } |
682 | Config config( "OpiePlayer" ); | 682 | Config config( "OpiePlayer" ); |
683 | config.setGroup( "PlayList" ); | 683 | config.setGroup( "PlayList" ); |
684 | 684 | ||
685 | config.writeEntry("CurrentPlaylist",filename); | 685 | config.writeEntry("CurrentPlaylist",filename); |
686 | config.write(); | 686 | config.write(); |
687 | currentPlayList=filename; | 687 | currentPlayList=filename; |
688 | 688 | ||
689 | m3uList->close(); | 689 | m3uList->close(); |
690 | delete m3uList; | 690 | delete m3uList; |
691 | 691 | ||
692 | d->selectedFiles->setSelectedItem( s); | 692 | d->selectedFiles->setSelectedItem( s); |
693 | setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName()); | 693 | setCaption(tr("OpiePlayer: ")+ QFileInfo(filename).baseName()); |
694 | 694 | ||
695 | } | 695 | } |
696 | 696 | ||
697 | // writes current playlist to current m3u file */ | 697 | // writes current playlist to current m3u file */ |
698 | void PlayListWidget::writeCurrentM3u() { | 698 | void PlayListWidget::writeCurrentM3u() { |
699 | qDebug("writing to current m3u"); | 699 | qDebug("writing to current m3u"); |
700 | Config cfg( "OpiePlayer" ); | 700 | Config cfg( "OpiePlayer" ); |
701 | cfg.setGroup("PlayList"); | 701 | cfg.setGroup("PlayList"); |
702 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default"); | 702 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default"); |
703 | 703 | ||
704 | Om3u *m3uList; | 704 | Om3u *m3uList; |
705 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); | 705 | m3uList = new Om3u( currentPlaylist, IO_ReadWrite | IO_Truncate ); |
706 | if( d->selectedFiles->first()) { | 706 | if( d->selectedFiles->first()) { |
707 | 707 | ||
708 | do { | 708 | do { |
709 | // qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file()); | 709 | // qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file()); |
710 | m3uList->add( d->selectedFiles->current()->file() ); | 710 | m3uList->add( d->selectedFiles->current()->file() ); |
711 | } | 711 | } |
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 | } |
777 | 777 | ||
778 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) { | 778 | void PlayListWidget::keyReleaseEvent( QKeyEvent *e ) { |
779 | switch ( e->key() ) { | 779 | switch ( e->key() ) { |
780 | ////////////////////////////// Zaurus keys | 780 | ////////////////////////////// Zaurus keys |
781 | case Key_F9: //activity | 781 | case Key_F9: //activity |
782 | // if(audioUI->isHidden()) | 782 | // if(audioUI->isHidden()) |
783 | // audioUI->showMaximized(); | 783 | // audioUI->showMaximized(); |
784 | break; | 784 | break; |
785 | case Key_F10: //contacts | 785 | case Key_F10: //contacts |
786 | // if( videoUI->isHidden()) | 786 | // if( videoUI->isHidden()) |
787 | // videoUI->showMaximized(); | 787 | // videoUI->showMaximized(); |
788 | break; | 788 | break; |
789 | case Key_F11: //menu | 789 | case Key_F11: //menu |
790 | break; | 790 | break; |
791 | case Key_F12: //home | 791 | case Key_F12: //home |
792 | // doBlank(); | 792 | // doBlank(); |
793 | break; | 793 | break; |
794 | case Key_F13: //mail | 794 | case Key_F13: //mail |
795 | // doUnblank(); | 795 | // doUnblank(); |
796 | break; | 796 | break; |
797 | case Key_Q: //add to playlist | 797 | case Key_Q: //add to playlist |
798 | addSelected(); | 798 | addSelected(); |
799 | break; | 799 | break; |
800 | case Key_R: //remove from playlist | 800 | case Key_R: //remove from playlist |
801 | removeSelected(); | 801 | removeSelected(); |
802 | break; | 802 | break; |
803 | // case Key_P: //play | 803 | // case Key_P: //play |
804 | // qDebug("Play"); | 804 | // qDebug("Play"); |
805 | // playSelected(); | 805 | // playSelected(); |
806 | // break; | 806 | // break; |
807 | case Key_Space: | 807 | case Key_Space: |
808 | // playSelected(); puh | 808 | // playSelected(); puh |