author | simon <simon> | 2002-12-04 10:52:00 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-04 10:52:00 (UTC) |
commit | 63541c46776721ef5ae63903e5b40838c1c49a43 (patch) (unidiff) | |
tree | e9beaf0d1340b32a7fffdce8e6dad7b0cbc54866 /noncore/multimedia/opieplayer2/playlistwidget.cpp | |
parent | d000538b68b3411a409e829c4e68f42f9646b940 (diff) | |
download | opie-63541c46776721ef5ae63903e5b40838c1c49a43.zip opie-63541c46776721ef5ae63903e5b40838c1c49a43.tar.gz opie-63541c46776721ef5ae63903e5b40838c1c49a43.tar.bz2 |
- merged scanForVideo and scanForAudio into a common scanFiles method in
the PlayListFileView. less duplicated code :)
Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 6bda71e..93e7919 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -46,27 +46,25 @@ | |||
46 | 46 | ||
47 | #include "playlistselection.h" | 47 | #include "playlistselection.h" |
48 | #include "playlistwidget.h" | 48 | #include "playlistwidget.h" |
49 | #include "mediaplayerstate.h" | 49 | #include "mediaplayerstate.h" |
50 | #include "inputDialog.h" | 50 | #include "inputDialog.h" |
51 | #include "om3u.h" | 51 | #include "om3u.h" |
52 | #include "playlistfileview.h" | ||
52 | 53 | ||
53 | //only needed for the random play | 54 | //only needed for the random play |
54 | #include <stdlib.h> | 55 | #include <stdlib.h> |
55 | #include <assert.h> | 56 | #include <assert.h> |
56 | 57 | ||
57 | #include "audiowidget.h" | 58 | #include "audiowidget.h" |
58 | #include "videowidget.h" | 59 | #include "videowidget.h" |
59 | 60 | ||
60 | extern MediaPlayerState *mediaPlayerState; | 61 | extern MediaPlayerState *mediaPlayerState; |
61 | // extern AudioWidget *audioUI; | 62 | // extern AudioWidget *audioUI; |
62 | // extern VideoWidget *videoUI; | 63 | // extern VideoWidget *videoUI; |
63 | 64 | ||
64 | QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; | ||
65 | // no m3u's here please | ||
66 | |||
67 | PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 65 | PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
68 | : PlayListWidgetGui( mediaPlayerState, parent, name ) { | 66 | : PlayListWidgetGui( mediaPlayerState, parent, name ) { |
69 | 67 | ||
70 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), | 68 | d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), |
71 | "opieplayer2/add_to_playlist", | 69 | "opieplayer2/add_to_playlist", |
72 | this , SLOT(addSelected() ) ); | 70 | this , SLOT(addSelected() ) ); |
@@ -636,45 +634,32 @@ void PlayListWidget::deletePlaylist() { | |||
636 | void PlayListWidget::playSelected() { | 634 | void PlayListWidget::playSelected() { |
637 | btnPlay( TRUE); | 635 | btnPlay( TRUE); |
638 | } | 636 | } |
639 | 637 | ||
640 | 638 | ||
641 | void PlayListWidget::scanForAudio() { | 639 | void PlayListWidget::scanForAudio() { |
642 | // qDebug("scan for audio"); | 640 | audioView->scanFiles(); |
643 | files.detachChildren(); | ||
644 | QListIterator<DocLnk> sdit( files.children() ); | ||
645 | for ( ; sdit.current(); ++sdit ) { | ||
646 | delete sdit.current(); | ||
647 | } | ||
648 | // Global::findDocuments( &files, "audio/*"); | ||
649 | Global::findDocuments( &files, audioMimes); | ||
650 | audioScan = true; | 641 | audioScan = true; |
651 | populateAudioView(); | 642 | populateAudioView(); |
652 | } | 643 | } |
653 | 644 | ||
654 | void PlayListWidget::scanForVideo() { | 645 | void PlayListWidget::scanForVideo() { |
655 | // qDebug("scan for video"); | 646 | videoView->scanFiles(); |
656 | vFiles.detachChildren(); | ||
657 | QListIterator<DocLnk> sdit( vFiles.children() ); | ||
658 | for ( ; sdit.current(); ++sdit ) { | ||
659 | delete sdit.current(); | ||
660 | } | ||
661 | Global::findDocuments(&vFiles, "video/*"); | ||
662 | videoScan = true; | 647 | videoScan = true; |
663 | populateVideoView(); | 648 | populateVideoView(); |
664 | } | 649 | } |
665 | 650 | ||
666 | void PlayListWidget::populateAudioView() { | 651 | void PlayListWidget::populateAudioView() { |
667 | audioView->clear(); | 652 | audioView->clear(); |
668 | StorageInfo storageInfo; | 653 | StorageInfo storageInfo; |
669 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); | 654 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); |
670 | if(!audioScan) { | 655 | if(!audioScan) { |
671 | scanForAudio(); | 656 | scanForAudio(); |
672 | } | 657 | } |
673 | 658 | ||
674 | QListIterator<DocLnk> dit( files.children() ); | 659 | QListIterator<DocLnk> dit( audioView->files().children() ); |
675 | // QListIterator<FileSystem> it ( fs ); | 660 | // QListIterator<FileSystem> it ( fs ); |
676 | audioView->clear(); | 661 | audioView->clear(); |
677 | 662 | ||
678 | QString storage; | 663 | QString storage; |
679 | for ( ; dit.current(); ++dit ) { | 664 | for ( ; dit.current(); ++dit ) { |
680 | // // for( ; it.current(); ++it ){ | 665 | // // for( ; it.current(); ++it ){ |
@@ -711,13 +696,13 @@ void PlayListWidget::populateVideoView() { | |||
711 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); | 696 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); |
712 | 697 | ||
713 | if(!videoScan ) { | 698 | if(!videoScan ) { |
714 | scanForVideo(); | 699 | scanForVideo(); |
715 | } | 700 | } |
716 | 701 | ||
717 | QListIterator<DocLnk> Vdit( vFiles.children() ); | 702 | QListIterator<DocLnk> Vdit( videoView->files().children() ); |
718 | // QListIterator<FileSystem> it ( fs ); | 703 | // QListIterator<FileSystem> it ( fs ); |
719 | videoView->clear(); | 704 | videoView->clear(); |
720 | QString storage, pathName; | 705 | QString storage, pathName; |
721 | for ( ; Vdit.current(); ++Vdit ) { | 706 | for ( ; Vdit.current(); ++Vdit ) { |
722 | // // for( ; it.current(); ++it ) { | 707 | // // for( ; it.current(); ++it ) { |
723 | // const QString name = (*Vdit)->name(); | 708 | // const QString name = (*Vdit)->name(); |