4 files changed, 14 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp
index 2726296..1e2ef89 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.cpp
+++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp
@@ -6,3 +6,3 @@
 PlayListFileView::PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name )
-    : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern )
+    : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_scannedFiles( false )
 {
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h
index 08db929..4e17966 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.h
+++ b/noncore/multimedia/opieplayer2/playlistfileview.h
@@ -14,3 +14,6 @@ public:
 
+    // both temporarily accessible that way until the caller code has
+    // been migrated into this class
     DocLnkSet &files() { return m_files; }
+    bool &scannedFiles() { return m_scannedFiles; }
 
@@ -22,2 +25,3 @@ private:
     DocLnkSet m_files;
+    bool m_scannedFiles;
 };
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 93e7919..12b8a71 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -153,4 +153,2 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
     // see which skins are installed
-    videoScan=false;
-    audioScan=false;
     audioPopulated=false;
@@ -256,3 +254,3 @@ void PlayListWidget::addAllToList() {
 
-  if(!audioScan) {
+  if(!audioView->scannedFiles()) {
     if(audioView->childCount() < 1)
@@ -272,3 +270,3 @@ void PlayListWidget::addAllToList() {
 
-  if(!videoScan) {
+  if(!videoView->scannedFiles()) {
     if(videoView->childCount() < 1)
@@ -316,3 +314,3 @@ void PlayListWidget::addAllMusicToList() {
 
-  if(!audioScan) {
+  if(!audioView->scannedFiles()) {
     if(audioView->childCount() < 1)
@@ -349,3 +347,3 @@ void PlayListWidget::addAllVideoToList() {
 
-  if(!videoScan) {
+  if(!videoView->scannedFiles()) {
     if(videoView->childCount() < 1)
@@ -640,3 +638,3 @@ void PlayListWidget::scanForAudio() {
   audioView->scanFiles();
-  audioScan = true;
+  audioView->scannedFiles() = true;
   populateAudioView();
@@ -646,3 +644,3 @@ void PlayListWidget::scanForVideo() {
   videoView->scanFiles();
-  videoScan = true;
+  videoView->scannedFiles() = true;
   populateVideoView();  
@@ -654,3 +652,3 @@ void PlayListWidget::populateAudioView() {
     //    const QList<FileSystem> &fs = storageInfo.fileSystems();
-    if(!audioScan) {
+    if(!audioView->scannedFiles()) {
         scanForAudio();
@@ -697,3 +695,3 @@ void PlayListWidget::populateVideoView() {
 
-    if(!videoScan ) {
+    if(!videoView->scannedFiles()) {
         scanForVideo();
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index e81ef3c..58efd47 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -96,3 +96,3 @@ private:
     int defaultSkinIndex;
-    bool audioScan, videoScan, audioPopulated, videoPopulated;
+    bool audioPopulated, videoPopulated;
     void readm3u(const QString &);