author | llornkcor <llornkcor> | 2002-04-26 23:55:00 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-26 23:55:00 (UTC) |
commit | 8ca9c8dad17ccaee9b0b8132324176c2a8e40526 (patch) (unidiff) | |
tree | 2a6b7cf8a2d5a45d32065cde00ed8399b5ef91d8 /core/multimedia/opieplayer/playlistwidget.cpp | |
parent | 75b32567bfeb67ed71877c4fa9e918c836a8a68b (diff) | |
download | opie-8ca9c8dad17ccaee9b0b8132324176c2a8e40526.zip opie-8ca9c8dad17ccaee9b0b8132324176c2a8e40526.tar.gz opie-8ca9c8dad17ccaee9b0b8132324176c2a8e40526.tar.bz2 |
fixed playing from audio/video list. added images from config file
Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 70b7cef..2118051 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -628,13 +628,4 @@ void PlayListWidget::saveList() { | |||
628 | writeConfig( cfg ); | 628 | writeConfig( cfg ); |
629 | 629 | ||
630 | // qDebug("same name so delete lnk??"); | ||
631 | // if( playLists->selected()->name() == filename) { | ||
632 | |||
633 | // qDebug("same name so delete lnk"); | ||
634 | // QFile().remove(playLists->selected()->file()); | ||
635 | // QFile().remove(playLists->selected()->linkFile()); | ||
636 | // playLists->reread(); | ||
637 | // } | ||
638 | // qDebug("new doclnk"); | ||
639 | DocLnk lnk; | 630 | DocLnk lnk; |
640 | // lnk.setComment( ""); | 631 | // lnk.setComment( ""); |
@@ -848,4 +839,5 @@ void PlayListWidget::btnPlay(bool b) { | |||
848 | tabWidget->setCurrentPage(1); | 839 | tabWidget->setCurrentPage(1); |
849 | d->selectedFiles->unSelect(); | 840 | d->selectedFiles->unSelect(); |
841 | insanityBool=FALSE; | ||
850 | // audioView->clearSelection(); | 842 | // audioView->clearSelection(); |
851 | } | 843 | } |
@@ -859,4 +851,5 @@ void PlayListWidget::btnPlay(bool b) { | |||
859 | tabWidget->setCurrentPage(2); | 851 | tabWidget->setCurrentPage(2); |
860 | d->selectedFiles->unSelect(); | 852 | d->selectedFiles->unSelect(); |
853 | insanityBool=FALSE; | ||
861 | // videoView->clearSelection(); | 854 | // videoView->clearSelection(); |
862 | } | 855 | } |
@@ -900,5 +893,5 @@ void PlayListWidget::playSelected() | |||
900 | { | 893 | { |
901 | btnPlay( TRUE); | 894 | btnPlay( TRUE); |
902 | d->selectedFiles->unSelect(); | 895 | // d->selectedFiles->unSelect(); |
903 | } | 896 | } |
904 | 897 | ||
@@ -1025,36 +1018,30 @@ void PlayListWidget::openFile() { | |||
1025 | if( fileDlg->result() == 1 ) { | 1018 | if( fileDlg->result() == 1 ) { |
1026 | filename = fileDlg->LineEdit1->text(); | 1019 | filename = fileDlg->LineEdit1->text(); |
1027 | |||
1028 | // InputDialog *fileDlg2; | ||
1029 | // fileDlg2 = new InputDialog(this,tr("Name"),TRUE, 0); | ||
1030 | // fileDlg2->exec(); | ||
1031 | // if( fileDlg2->result() == 1 ) { | ||
1032 | // name = fileDlg2->LineEdit1->text(); | ||
1033 | // } | ||
1034 | //http://205.188.234.129:8030 | 1020 | //http://205.188.234.129:8030 |
1035 | // http://66.28.68.70:8000 | 1021 | // http://66.28.68.70:8000 |
1036 | qDebug(filename); | 1022 | qDebug(filename); |
1037 | DocLnk lnk; | 1023 | if(filename.right(3) == "m3u") |
1038 | // if(filename.left(7) == "http://") | 1024 | readm3u( filename); |
1039 | // name= filename.right(filename.length()-filename.find("http://")-7); | 1025 | else if(filename.right(3) == "pls") |
1040 | // else name = filename; | 1026 | readPls( filename); |
1041 | // qDebug("name is "+name); | 1027 | else { |
1042 | // lnk.setComment(filename); | 1028 | DocLnk lnk; |
1043 | lnk.setName(filename); //sets file name | 1029 | |
1044 | if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") | 1030 | lnk.setName(filename); //sets file name |
1045 | filename += "/"; | 1031 | if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") |
1046 | lnk.setFile(filename); //sets File property | 1032 | filename += "/"; |
1047 | 1033 | lnk.setFile(filename); //sets File property | |
1048 | lnk.setType("audio/x-mpegurl"); | 1034 | |
1049 | lnk.setExec("opieplayer"); | 1035 | lnk.setType("audio/x-mpegurl"); |
1050 | lnk.setIcon("opieplayer/MPEGPlayer"); | 1036 | lnk.setExec("opieplayer"); |
1051 | 1037 | lnk.setIcon("opieplayer/MPEGPlayer"); | |
1052 | if(!lnk.writeLink()) | 1038 | |
1053 | qDebug("Writing doclink did not work"); | 1039 | if(!lnk.writeLink()) |
1054 | d->selectedFiles->addToSelection( lnk); | 1040 | qDebug("Writing doclink did not work"); |
1041 | d->selectedFiles->addToSelection( lnk); | ||
1055 | // if(fileDlg2) | 1042 | // if(fileDlg2) |
1056 | // delete fileDlg2; | 1043 | // delete fileDlg2; |
1044 | } | ||
1057 | } | 1045 | } |
1058 | |||
1059 | if(fileDlg) | 1046 | if(fileDlg) |
1060 | delete fileDlg; | 1047 | delete fileDlg; |
@@ -1106,2 +1093,14 @@ void PlayListWidget::doUnblank() { | |||
1106 | h <<-3;// v[1]; // -3 Force on | 1093 | h <<-3;// v[1]; // -3 Force on |
1107 | } | 1094 | } |
1095 | |||
1096 | void PlayListWidget::readm3u(const QString &filename) { | ||
1097 | |||
1098 | } | ||
1099 | |||
1100 | void PlayListWidget::writem3u(const QString &filename) { | ||
1101 | |||
1102 | } | ||
1103 | |||
1104 | void PlayListWidget::readPls(const QString &filename) { | ||
1105 | |||
1106 | } | ||