- merged scanForVideo and scanForAudio into a common scanFiles method in

  the PlayListFileView. less duplicated code :)

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
@@ -51,2 +51,3 @@
 #include "om3u.h"
+#include "playlistfileview.h"
 
@@ -63,5 +64,2 @@ extern MediaPlayerState *mediaPlayerState;
 
-QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg";
-// no m3u's here please
-
 PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
@@ -641,10 +639,3 @@ void PlayListWidget::playSelected() {
 void PlayListWidget::scanForAudio() {
-//  qDebug("scan for audio");
-  files.detachChildren();
-  QListIterator<DocLnk> sdit( files.children() );
-  for ( ; sdit.current(); ++sdit ) {
-    delete sdit.current();
-  }
-//  Global::findDocuments( &files, "audio/*");
-  Global::findDocuments( &files, audioMimes);
+  audioView->scanFiles();
   audioScan = true;
@@ -654,9 +645,3 @@ void PlayListWidget::scanForAudio() {
 void PlayListWidget::scanForVideo() {
-//  qDebug("scan for video");
-  vFiles.detachChildren();
-  QListIterator<DocLnk> sdit( vFiles.children() );
-  for ( ; sdit.current(); ++sdit ) {
-    delete sdit.current();
-  }
-  Global::findDocuments(&vFiles, "video/*");
+  videoView->scanFiles();
   videoScan = true;
@@ -673,3 +658,3 @@ void PlayListWidget::populateAudioView() {
 
-    QListIterator<DocLnk> dit( files.children() );
+    QListIterator<DocLnk> dit( audioView->files().children() );
     //    QListIterator<FileSystem> it ( fs );
@@ -716,3 +701,3 @@ void PlayListWidget::populateVideoView() {
 
-    QListIterator<DocLnk> Vdit( vFiles.children() );
+    QListIterator<DocLnk> Vdit( videoView->files().children() );
 //    QListIterator<FileSystem> it ( fs );