summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp46
1 files changed, 35 insertions, 11 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 4e31670..4ee784e 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -70,42 +70,40 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
70 this , SLOT(removeSelected() ) ); 70 this , SLOT(removeSelected() ) );
71 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play", 71 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
72 this , SLOT( btnPlay( bool) ), TRUE ); 72 this , SLOT( btnPlay( bool) ), TRUE );
73 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle", 73 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
74 &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); 74 &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE );
75 d->tbLoop = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop", 75 d->tbLoop = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop",
76 &mediaPlayerState, SLOT( setLooping( bool ) ), TRUE ); 76 &mediaPlayerState, SLOT( setLooping( bool ) ), TRUE );
77 77
78 (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); 78 (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
79 (void)new MenuItem( pmPlayList, tr( "Add all audio files" ), 79 (void)new MenuItem( pmPlayList, tr( "Add all audio files" ),
80 this, SLOT( addAllMusicToList() ) ); 80 this, SLOT( addAllMusicToList() ) );
81 (void)new MenuItem( pmPlayList, tr( "Add all video files" ), 81 (void)new MenuItem( pmPlayList, tr( "Add all video files" ),
82 this, SLOT( addAllVideoToList() ) ); 82 this, SLOT( addAllVideoToList() ) );
83 (void)new MenuItem( pmPlayList, tr( "Add all files" ), 83 (void)new MenuItem( pmPlayList, tr( "Add all files" ),
84 this, SLOT( addAllToList() ) ); 84 this, SLOT( addAllToList() ) );
85 pmPlayList->insertSeparator(-1); 85 pmPlayList->insertSeparator(-1);
86// (void)new MenuItem( pmPlayList, tr( "Save PlayList" ),
87// this, SLOT( saveList() ) );
88 (void)new MenuItem( pmPlayList, tr( "Save Playlist" ),
89 this, SLOT(writem3u() ) );
90 pmPlayList->insertSeparator(-1);
91 (void)new MenuItem( pmPlayList, tr( "Add File" ), 86 (void)new MenuItem( pmPlayList, tr( "Add File" ),
92 this,SLOT( openFile() ) ); 87 this,SLOT( openFile() ) );
93 (void)new MenuItem( pmPlayList, tr("Add URL"), 88 (void)new MenuItem( pmPlayList, tr("Add URL"),
94 this,SLOT( openURL() ) ); 89 this,SLOT( openURL() ) );
95 pmPlayList->insertSeparator(-1); 90 pmPlayList->insertSeparator(-1);
91 (void)new MenuItem( pmPlayList, tr( "Save Playlist" ),
92 this, SLOT(writem3u() ) );
93 pmPlayList->insertSeparator(-1);
96 (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), 94 (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ),
97 audioView, SLOT( scanFiles() ) ); 95 audioView, SLOT( scanFiles() ) );
98 (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), 96 (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ),
99 videoView, SLOT( scanFiles() ) ); 97 videoView, SLOT( scanFiles() ) );
100 98
101 pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"), 99 pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"),
102 &mediaPlayerState, SLOT( toggleFullscreen() ) ); 100 &mediaPlayerState, SLOT( toggleFullscreen() ) );
103 101
104 Config cfg( "OpiePlayer" ); 102 Config cfg( "OpiePlayer" );
105 bool b= cfg.readBoolEntry("FullScreen", 0); 103 bool b= cfg.readBoolEntry("FullScreen", 0);
106 mediaPlayerState.setFullscreen( b ); 104 mediaPlayerState.setFullscreen( b );
107 pmView->setItemChecked( -16, b ); 105 pmView->setItemChecked( -16, b );
108 106
109 (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", 107 (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up",
110 d->selectedFiles, SLOT(moveSelectedUp() ) ); 108 d->selectedFiles, SLOT(moveSelectedUp() ) );
111 (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", 109 (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut",
@@ -767,64 +765,90 @@ void PlayListWidget::readListFromFile( const QString &filename ) {
767 do { 765 do {
768 // qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file()); 766 // qDebug( "add writeCurrentM3u " +d->selectedFiles->current()->file());
769 m3uList->add( d->selectedFiles->current()->file() ); 767 m3uList->add( d->selectedFiles->current()->file() );
770 } 768 }
771 while ( d->selectedFiles->next() ); 769 while ( d->selectedFiles->next() );
772 // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" ); 770 // qDebug( "<<<<<<<<<<<<>>>>>>>>>>>>>>>>>" );
773 m3uList->write(); 771 m3uList->write();
774 m3uList->close(); 772 m3uList->close();
775 } 773 }
776 delete m3uList; 774 delete m3uList;
777 775
778 } 776 }
779 777
780 /* 778 /*
781 writes current playlist to m3u file */ 779 writes current playlist to m3u file */
782void PlayListWidget::writem3u() { 780void PlayListWidget::writem3u() {
783 InputDialog *fileDlg; 781 //InputDilog *fileDlg;
784 fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0); 782 //fileDlg = new InputDialog( this, tr( "Save m3u Playlist " ), TRUE, 0);
785 fileDlg->exec(); 783 //fileDlg->exec();
784
785 Config cfg( "OpiePlayer" );
786 cfg.setGroup("Dialog");
787 MimeTypes types;
788 QStringList audio, video, all;
789 audio << "audio/*";
790 audio << "playlist/plain";
791 audio << "audio/x-mpegurl";
792
793 video << "video/*";
794 video << "playlist/plain";
795
796 all += audio;
797 all += video;
798 types.insert("All Media Files", all );
799 types.insert("Audio", audio );
800 types.insert("Video", video );
801
802 QString str = OFileDialog::getOpenFileName( 1,
803 cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"",
804 types, 0 );
805 if(str.left(2) == "//") str=str.right(str.length()-1);
806 cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath());
807
808
786 QString name, filename, list; 809 QString name, filename, list;
787 Om3u *m3uList; 810 Om3u *m3uList;
788 811
789 if( fileDlg->result() == 1 ) { 812 if( !str.isEmpty() ) {
790 name = fileDlg->text(); 813 name = str;
814 // name = fileDlg->text();
791// qDebug( filename ); 815// qDebug( filename );
792 if( name.find("/",0,true) != -1) {// assume they specify a file path 816 if( name.find("/",0,true) != -1) {// assume they specify a file path
793 filename = name; 817 filename = name;
794 name = name.right(name.length()- name.findRev("/",-1,true) - 1 ); 818 name = name.right(name.length()- name.findRev("/",-1,true) - 1 );
795 } 819 }
796 else //otherwise dump it somewhere noticable 820 else //otherwise dump it somewhere noticable
797 filename = QPEApplication::documentDir() + "/" + name; 821 filename = QPEApplication::documentDir() + "/" + name;
798 822
799 if( filename.right( 3 ) != "m3u" ) //needs filename extension 823 if( filename.right( 3 ) != "m3u" ) //needs filename extension
800 filename += ".m3u"; 824 filename += ".m3u";
801 825
802 if( d->selectedFiles->first()) { //ramble through playlist view 826 if( d->selectedFiles->first()) { //ramble through playlist view
803 m3uList = new Om3u( filename, IO_ReadWrite | IO_Truncate); 827 m3uList = new Om3u( filename, IO_ReadWrite | IO_Truncate);
804 828
805 do { 829 do {
806 m3uList->add( d->selectedFiles->current()->file()); 830 m3uList->add( d->selectedFiles->current()->file());
807 } 831 }
808 while ( d->selectedFiles->next() ); 832 while ( d->selectedFiles->next() );
809 // qDebug( list ); 833 // qDebug( list );
810 m3uList->write(); 834 m3uList->write();
811 m3uList->close(); 835 m3uList->close();
812 delete m3uList; 836 delete m3uList;
813 837
814 delete fileDlg; 838 //delete fileDlg;
815 839
816 DocLnk lnk; 840 DocLnk lnk;
817 lnk.setFile( filename); 841 lnk.setFile( filename);
818 lnk.setIcon("opieplayer2/playlist2"); 842 lnk.setIcon("opieplayer2/playlist2");
819 lnk.setName( name); //sets file name 843 lnk.setName( name); //sets file name
820 844
821 // qDebug(filename); 845 // qDebug(filename);
822 Config config( "OpiePlayer" ); 846 Config config( "OpiePlayer" );
823 config.setGroup( "PlayList" ); 847 config.setGroup( "PlayList" );
824 848
825 config.writeEntry("CurrentPlaylist",filename); 849 config.writeEntry("CurrentPlaylist",filename);
826 currentPlayList=filename; 850 currentPlayList=filename;
827 851
828 if(!lnk.writeLink()) { 852 if(!lnk.writeLink()) {
829 qDebug("Writing doclink did not work"); 853 qDebug("Writing doclink did not work");
830 } 854 }