- move more view population logic into PlayListFileView

1 files changed, 6 insertions, 24 deletions

diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 460a0bf..eb0606d 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -152,6 +152,4 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
 
     // see which skins are installed
-    audioPopulated=false;
-    videoPopulated=false;
     populateSkinsMenu();
     initializeStates();
@@ -255,5 +253,5 @@ void PlayListWidget::addAllToList() {
   if(!audioView->scannedFiles()) {
     if(audioView->childCount() < 1)
-      populateAudioView();
+      audioView->populateView();
   }
 
@@ -271,5 +269,5 @@ void PlayListWidget::addAllToList() {
   if(!videoView->scannedFiles()) {
     if(videoView->childCount() < 1)
-      populateVideoView();
+      videoView->populateView();
   }
 
@@ -315,5 +313,5 @@ void PlayListWidget::addAllMusicToList() {
   if(!audioView->scannedFiles()) {
     if(audioView->childCount() < 1)
-      populateAudioView();
+      audioView->populateView();
   }
 
@@ -348,5 +346,5 @@ void PlayListWidget::addAllVideoToList() {
   if(!videoView->scannedFiles()) {
     if(videoView->childCount() < 1)
-      populateVideoView();
+      videoView->populateView();
   }
 
@@ -573,6 +571,5 @@ void PlayListWidget::tabChanged(QWidget *) {
     case AudioFiles:
     {
-      //        audioView->clear();
-        if(!audioPopulated) populateAudioView();
+        audioView->populateView();
 
         if( !tbDeletePlaylist->isHidden() ) {
@@ -585,6 +582,5 @@ void PlayListWidget::tabChanged(QWidget *) {
     case VideoFiles:
     {
-      //        videoView->clear();
-        if(!videoPopulated) populateVideoView();
+        videoView->populateView();
         if( !tbDeletePlaylist->isHidden() ) {
             tbDeletePlaylist->hide();
@@ -637,22 +633,8 @@ void PlayListWidget::playSelected() {
 void PlayListWidget::scanForAudio() {
   audioView->scanFiles();
-  audioView->scannedFiles() = true;
-  populateAudioView();
 }
 
 void PlayListWidget::scanForVideo() {
   videoView->scanFiles();
-  videoView->scannedFiles() = true;
-  populateVideoView();  
-}
-
-void PlayListWidget::populateAudioView() {
-    audioView->populateView();
-    audioPopulated = true;
-}
-
-void PlayListWidget::populateVideoView() {
-    videoView->populateView();
-    videoPopulated=true;
 }