summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/playlistwidget.cpp
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp25
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
@@ -50,4 +50,5 @@
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
@@ -62,7 +63,4 @@ extern MediaPlayerState *mediaPlayerState;
62// extern VideoWidget *videoUI; 63// extern VideoWidget *videoUI;
63 64
64QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg";
65// no m3u's here please
66
67PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 65PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
68 : PlayListWidgetGui( mediaPlayerState, parent, name ) { 66 : PlayListWidgetGui( mediaPlayerState, parent, name ) {
@@ -640,12 +638,5 @@ void PlayListWidget::playSelected() {
640 638
641void PlayListWidget::scanForAudio() { 639void 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();
@@ -653,11 +644,5 @@ void PlayListWidget::scanForAudio() {
653 644
654void PlayListWidget::scanForVideo() { 645void 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();
@@ -672,5 +657,5 @@ void PlayListWidget::populateAudioView() {
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();
@@ -715,5 +700,5 @@ void PlayListWidget::populateVideoView() {
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();