Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 80 |
1 files changed, 67 insertions, 13 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index c91a565..4e31670 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -3,3 +3,3 @@ | |||
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002,2003 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | 5 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> |
@@ -39,2 +39,5 @@ | |||
39 | #include <qpe/resource.h> | 39 | #include <qpe/resource.h> |
40 | #include <qpe/config.h> | ||
41 | |||
42 | #include <opie/ofiledialog.h> | ||
40 | 43 | ||
@@ -87,4 +90,6 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
87 | pmPlayList->insertSeparator(-1); | 90 | pmPlayList->insertSeparator(-1); |
88 | (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), | 91 | (void)new MenuItem( pmPlayList, tr( "Add File" ), |
89 | this,SLOT( openFile() ) ); | 92 | this,SLOT( openFile() ) ); |
93 | (void)new MenuItem( pmPlayList, tr("Add URL"), | ||
94 | this,SLOT( openURL() ) ); | ||
90 | pmPlayList->insertSeparator(-1); | 95 | pmPlayList->insertSeparator(-1); |
@@ -329,3 +334,3 @@ void PlayListWidget::setDocument( const QString& fileref ) { | |||
329 | QFileInfo fileInfo(fileref); | 334 | QFileInfo fileInfo(fileref); |
330 | 335 | ||
331 | if ( !fileInfo.exists() ) { | 336 | if ( !fileInfo.exists() ) { |
@@ -339,3 +344,3 @@ void PlayListWidget::setDocument( const QString& fileref ) { | |||
339 | 344 | ||
340 | if( extension.find( "m3u", 0, false) != -1 | 345 | if( extension.find( "m3u", 0, false) != -1 |
341 | || extension.find( "pls", 0, false) != -1 ) { | 346 | || extension.find( "pls", 0, false) != -1 ) { |
@@ -604,8 +609,8 @@ bool PlayListWidget::inFileListMode() const | |||
604 | 609 | ||
605 | void PlayListWidget::openFile() { | 610 | void PlayListWidget::openURL() { |
606 | // http://66.28.164.33:2080 | 611 | // http://66.28.164.33:2080 |
607 | // http://somafm.com/star0242.m3u | 612 | // http://somafm.com/star0242.m3u |
608 | QString filename, name; | 613 | QString filename, name; |
609 | InputDialog *fileDlg; | 614 | InputDialog *fileDlg; |
610 | fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); | 615 | fileDlg = new InputDialog(this,tr("Add URL"),TRUE, 0); |
611 | fileDlg->exec(); | 616 | fileDlg->exec(); |
@@ -655,2 +660,51 @@ void PlayListWidget::openFile() { | |||
655 | 660 | ||
661 | |||
662 | void PlayListWidget::openFile() { | ||
663 | |||
664 | QString filename, name; | ||
665 | |||
666 | Config cfg( "OpiePlayer" ); | ||
667 | cfg.setGroup("Dialog"); | ||
668 | MimeTypes types; | ||
669 | QStringList audio, video, all; | ||
670 | audio << "audio/*"; | ||
671 | audio << "playlist/plain"; | ||
672 | audio << "audio/x-mpegurl"; | ||
673 | |||
674 | video << "video/*"; | ||
675 | video << "playlist/plain"; | ||
676 | |||
677 | all += audio; | ||
678 | all += video; | ||
679 | types.insert("All Media Files", all ); | ||
680 | types.insert("Audio", audio ); | ||
681 | types.insert("Video", video ); | ||
682 | |||
683 | QString str = OFileDialog::getOpenFileName( 1, | ||
684 | cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"", | ||
685 | types, 0 ); | ||
686 | if(str.left(2) == "//") str=str.right(str.length()-1); | ||
687 | cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath()); | ||
688 | |||
689 | |||
690 | if( !str.isEmpty() ) { | ||
691 | qDebug( "Selected filename is " + str ); | ||
692 | filename = str; | ||
693 | DocLnk lnk; | ||
694 | Config cfg( "OpiePlayer" ); | ||
695 | cfg.setGroup("PlayList"); | ||
696 | |||
697 | if( filename.right( 3) == "m3u" || filename.right(3) == "pls" ) { | ||
698 | readListFromFile( filename ); | ||
699 | } else { | ||
700 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | ||
701 | lnk.setFile( filename ); //sets file name | ||
702 | d->selectedFiles->addToSelection( lnk); | ||
703 | writeCurrentM3u(); | ||
704 | d->selectedFiles->setSelectedItem( lnk.name()); | ||
705 | } | ||
706 | } | ||
707 | } | ||
708 | |||
709 | |||
656 | void PlayListWidget::readListFromFile( const QString &filename ) { | 710 | void PlayListWidget::readListFromFile( const QString &filename ) { |
@@ -678,3 +732,3 @@ void PlayListWidget::readListFromFile( const QString &filename ) { | |||
678 | if(s.left(1) != "/") { | 732 | if(s.left(1) != "/") { |
679 | 733 | ||
680 | lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); | 734 | lnk.setFile( QFileInfo(filename).dirPath()+"/"+s); |
@@ -746,3 +800,3 @@ void PlayListWidget::writem3u() { | |||
746 | filename += ".m3u"; | 800 | filename += ".m3u"; |
747 | 801 | ||
748 | if( d->selectedFiles->first()) { //ramble through playlist view | 802 | if( d->selectedFiles->first()) { //ramble through playlist view |
@@ -933,5 +987,5 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | |||
933 | } else if ( msg == "next()" ) { //select next in list | 987 | } else if ( msg == "next()" ) { //select next in list |
934 | mediaPlayerState.setNext(); | 988 | mediaPlayerState.setNext(); |
935 | } else if ( msg == "prev()" ) { //select previous in list | 989 | } else if ( msg == "prev()" ) { //select previous in list |
936 | mediaPlayerState.setPrev(); | 990 | mediaPlayerState.setPrev(); |
937 | } else if ( msg == "toggleLooping()" ) { //loop or not loop | 991 | } else if ( msg == "toggleLooping()" ) { //loop or not loop |
@@ -963,3 +1017,3 @@ void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | |||
963 | } | 1017 | } |
964 | 1018 | ||
965 | } | 1019 | } |